mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

libgtk2ui => libgtkui

Browse source
This commit is contained in:
Cheng Zhao 2017-01-26 19:54:24 +09:00
parent a749a3dd2a
commit abececd78b
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/brightray.gyp
View file

@ -69,7 +69,7 @@
}, },
'cflags': [ 'cflags': [
'<!@(<(pkg-config) --cflags <(linux_system_libraries))', '<!@(<(pkg-config) --cflags <(linux_system_libraries))',
# Needed by using libgtk2ui: # Needed by using libgtkui:
'-Wno-deprecated-register', '-Wno-deprecated-register',
'-Wno-sentinel', '-Wno-sentinel',
], ],
@ -88,7 +88,7 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# Following libraries are always linked statically. # Following libraries are always linked statically.
'<(libchromiumcontent_dir)/libgtk2ui.a', '<(libchromiumcontent_dir)/libgtkui.a',
'<(libchromiumcontent_dir)/libhttp_server.a', '<(libchromiumcontent_dir)/libhttp_server.a',
'<(libchromiumcontent_dir)/libdesktop_capture.a', '<(libchromiumcontent_dir)/libdesktop_capture.a',
'<(libchromiumcontent_dir)/libdom_keycode_converter.a', '<(libchromiumcontent_dir)/libdom_keycode_converter.a',

5
brightray/browser/browser_main_parts.cc
View file

@ -36,7 +36,7 @@
#include "base/nix/xdg_util.h" #include "base/nix/xdg_util.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "browser/brightray_paths.h" #include "browser/brightray_paths.h"
#include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" #include "chrome/browser/ui/libgtkui/gtk_ui.h"
#include "ui/base/x/x11_util.h" #include "ui/base/x/x11_util.h"
#include "ui/base/x/x11_util_internal.h" #include "ui/base/x/x11_util_internal.h"
#include "ui/views/linux_ui/linux_ui.h" #include "ui/views/linux_ui/linux_ui.h"
@ -244,8 +244,7 @@ int BrowserMainParts::PreCreateThreads() {
display::Screen* screen = views::CreateDesktopScreen(); display::Screen* screen = views::CreateDesktopScreen();
display::Screen::SetScreenInstance(screen); display::Screen::SetScreenInstance(screen);
#if defined(USE_X11) #if defined(USE_X11)
views::LinuxUI::instance()->UpdateDeviceScaleFactor( views::LinuxUI::instance()->UpdateDeviceScaleFactor();
screen->GetPrimaryDisplay().device_scale_factor());
#endif #endif
#endif #endif
return 0; return 0;

4
brightray/browser/linux/libnotify_notification.cc
View file

@ -8,7 +8,7 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "browser/notification_delegate.h" #include "browser/notification_delegate.h"
#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
#include "common/application_info.h" #include "common/application_info.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
@ -111,7 +111,7 @@ void LibnotifyNotification::Show(const base::string16& title,
} }
if (!icon.drawsNothing()) { if (!icon.drawsNothing()) {
GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(icon); GdkPixbuf* pixbuf = libgtkui::GdkPixbufFromSkBitmap(icon);
libnotify_loader_.notify_notification_set_image_from_pixbuf( libnotify_loader_.notify_notification_set_image_from_pixbuf(
notification_, pixbuf); notification_, pixbuf);
libnotify_loader_.notify_notification_set_timeout( libnotify_loader_.notify_notification_set_timeout(

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit b71afafe59998daf0cb275b50140378b8c88b101 Subproject commit 0360b49dc59dcaad80bc056c9c9678273d4200e6