libgtk2ui => libgtkui

brightray/brightray.gyp

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

brightray/browser/browser_main_parts.cc

@@ -36,7 +36,7 @@
 #include "base/nix/xdg_util.h"
 #include "base/threading/thread_task_runner_handle.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_internal.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ -244,8 +244,7 @@ int BrowserMainParts::PreCreateThreads() {
   display::Screen* screen = views::CreateDesktopScreen();
   display::Screen::SetScreenInstance(screen);
 #if defined(USE_X11)
-  views::LinuxUI::instance()->UpdateDeviceScaleFactor(
-      screen->GetPrimaryDisplay().device_scale_factor());
+  views::LinuxUI::instance()->UpdateDeviceScaleFactor();
 #endif
 #endif
   return 0;

brightray/browser/linux/libnotify_notification.cc

@@ -8,7 +8,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.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 "third_party/skia/include/core/SkBitmap.h"
 
@@ -111,7 +111,7 @@ void LibnotifyNotification::Show(const base::string16& title,
   }
 
   if (!icon.drawsNothing()) {
-    GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(icon);
+    GdkPixbuf* pixbuf = libgtkui::GdkPixbufFromSkBitmap(icon);
     libnotify_loader_.notify_notification_set_image_from_pixbuf(
         notification_, pixbuf);
     libnotify_loader_.notify_notification_set_timeout(