Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Build fixes for Ubuntu18.04 #649

Merged
merged 1 commit into from
May 14, 2018
Merged

Build fixes for Ubuntu18.04 #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions appshell/appshell_extensions_platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "appshell/browser/main_context.h"
#include "appshell/browser/root_window_manager.h"
#include "appshell/browser/root_window_gtk.h"
#include <unicode/unistr.h>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do these headers work for all linux versions?

Copy link
Contributor Author

@g-217 g-217 May 14, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I have just explicitly included these headers.(standard unicode library headers were indirectly included through other headers anyway)

#endif

#define UTF8_BOM "\xEF\xBB\xBF"
Expand Down
3 changes: 3 additions & 0 deletions appshell/appshell_extensions_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@

#ifdef OS_LINUX
#include <gtk/gtk.h>
#include <unicode/ucnv_err.h>
#include <unicode/uenum.h>
#include <unicode/localpointer.h>
#endif

// Extension error codes. These MUST be in sync with the error
Expand Down
4 changes: 4 additions & 0 deletions appshell/browser/client_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,17 @@ bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
}
#endif

#ifndef OS_LINUX
//We do not plan to add any feature to parent class(::ClientHandler) implementation of this function.
//So override is useless, modern compilers will complain about this.
void ClientHandler::OnDraggableRegionsChanged(
CefRefPtr<CefBrowser> browser,
const std::vector<CefDraggableRegion>& regions) {
CEF_REQUIRE_UI_THREAD();

NotifyDraggableRegions(regions);
}
#endif

bool ClientHandler::OnRequestGeolocationPermission(
CefRefPtr<CefBrowser> browser,
Expand Down
4 changes: 4 additions & 0 deletions appshell/browser/client_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,13 @@ class ClientHandler :
CefDragHandler::DragOperationsMask mask) OVERRIDE;
#endif

#ifndef OS_LINUX
//We do not plan to add any feature to parent class(::ClientHandler) implementation of this function.
//So override is useless, modern compilers will complain about this.
void OnDraggableRegionsChanged(
CefRefPtr<CefBrowser> browser,
const std::vector<CefDraggableRegion>& regions) OVERRIDE;
#endif

// CefGeolocationHandler methods
bool OnRequestGeolocationPermission(
Expand Down