Skip to content

Commit be29ea4

Browse files
zcbenzkevinsawicki
zcbenz
authored and
kevinsawicki
committed
libgtk2ui => libgtkui
1 parent 820c082 commit be29ea4

File tree

11 files changed

+32
-30
lines changed

11 files changed

+32
-30
lines changed

‎atom/browser/atom_browser_main_parts.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "v8/include/v8-debug.h"
2525

2626
#if defined(USE_X11)
27-
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
27+
#include "chrome/browser/ui/libgtkui/gtk_util.h"
2828
#include "ui/events/devices/x11/touch_factory_x11.h"
2929
#endif
3030

@@ -170,7 +170,7 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
170170
bridge_task_runner_ = nullptr;
171171

172172
#if defined(USE_X11)
173-
libgtk2ui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
173+
libgtkui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
174174
#endif
175175

176176
#if !defined(OS_MACOSX)

‎atom/browser/browser_linux.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "atom/browser/window_list.h"
1111
#include "atom/common/atom_version.h"
1212
#include "brightray/common/application_info.h"
13-
#include "chrome/browser/ui/libgtk2ui/unity_service.h"
13+
#include "chrome/browser/ui/libgtkui/unity_service.h"
1414

1515
namespace atom {
1616

‎atom/browser/common_web_contents_delegate.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ FileSystem CreateFileSystemStruct(
9494
return FileSystem(file_system_name, root_url, file_system_path);
9595
}
9696

97-
base::DictionaryValue* CreateFileSystemValue(const FileSystem& file_system) {
98-
auto* file_system_value = new base::DictionaryValue();
97+
std::unique_ptr<base::DictionaryValue> CreateFileSystemValue(
98+
const FileSystem& file_system) {
99+
std::unique_ptr<base::DictionaryValue> file_system_value(
100+
new base::DictionaryValue());
99101
file_system_value->SetString("fileSystemName", file_system.file_system_name);
100102
file_system_value->SetString("rootURL", file_system.root_url);
101103
file_system_value->SetString("fileSystemPath", file_system.file_system_path);

‎atom/browser/native_window_views.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "atom/browser/ui/x/window_state_watcher.h"
4242
#include "atom/browser/ui/x/x_window_utils.h"
4343
#include "base/strings/string_util.h"
44-
#include "chrome/browser/ui/libgtk2ui/unity_service.h"
44+
#include "chrome/browser/ui/libgtkui/unity_service.h"
4545
#include "ui/base/x/x11_util.h"
4646
#include "ui/gfx/x/x11_types.h"
4747
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"

‎atom/browser/ui/file_dialog_gtk.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "base/callback.h"
1010
#include "base/files/file_util.h"
1111
#include "base/strings/string_util.h"
12-
#include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
13-
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
12+
#include "chrome/browser/ui/libgtkui/gtk_signal.h"
13+
#include "chrome/browser/ui/libgtkui/gtk_util.h"
1414
#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
1515

1616
namespace file_dialog {
@@ -61,7 +61,7 @@ class FileChooserDialog {
6161
NULL);
6262
if (parent_) {
6363
parent_->SetEnabled(false);
64-
libgtk2ui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
64+
libgtkui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
6565
gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
6666
}
6767

@@ -109,7 +109,7 @@ class FileChooserDialog {
109109

110110
// We need to call gtk_window_present after making the widgets visible to
111111
// make sure window gets correctly raised and gets focus.
112-
int time = views::X11DesktopHandler::get()->wm_user_time_ms();
112+
int time = ui::X11EventSource::GetInstance()->GetTimestamp();
113113
gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
114114
}
115115

‎atom/browser/ui/message_box_gtk.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "base/callback.h"
1212
#include "base/strings/string_util.h"
1313
#include "base/strings/utf_string_conversions.h"
14-
#include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
15-
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
16-
#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
14+
#include "chrome/browser/ui/libgtkui/gtk_signal.h"
15+
#include "chrome/browser/ui/libgtkui/gtk_util.h"
16+
#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
1717
#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
1818

1919
#define ANSI_FOREGROUND_RED "\x1b[31m"
@@ -54,7 +54,7 @@ class GtkMessageBox : public NativeWindowObserver {
5454

5555
// Set dialog's icon.
5656
if (!icon.isNull()) {
57-
GdkPixbuf* pixbuf = libgtk2ui::GdkPixbufFromSkBitmap(*icon.bitmap());
57+
GdkPixbuf* pixbuf = libgtkui::GdkPixbufFromSkBitmap(*icon.bitmap());
5858
GtkIconSource* iconsource = gtk_icon_source_new();
5959
GtkIconSet* iconset = gtk_icon_set_new();
6060
gtk_icon_source_set_pixbuf(iconsource, pixbuf);
@@ -80,7 +80,7 @@ class GtkMessageBox : public NativeWindowObserver {
8080
if (parent_) {
8181
parent_->AddObserver(this);
8282
parent_->SetEnabled(false);
83-
libgtk2ui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
83+
libgtkui::SetGtkTransientForAura(dialog_, parent_->GetNativeWindow());
8484
gtk_window_set_modal(GTK_WINDOW(dialog_), TRUE);
8585
}
8686
}
@@ -126,7 +126,7 @@ class GtkMessageBox : public NativeWindowObserver {
126126
gtk_widget_show_all(dialog_);
127127
// We need to call gtk_window_present after making the widgets visible to
128128
// make sure window gets correctly raised and gets focus.
129-
int time = views::X11DesktopHandler::get()->wm_user_time_ms();
129+
int time = ui::X11EventSource::GetInstance()->GetTimestamp();
130130
gtk_window_present_with_time(GTK_WINDOW(dialog_), time);
131131
}
132132

‎atom/browser/ui/tray_icon_gtk.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include "atom/browser/browser.h"
88
#include "base/strings/stringprintf.h"
99
#include "base/strings/utf_string_conversions.h"
10-
#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
11-
#include "chrome/browser/ui/libgtk2ui/gtk2_status_icon.h"
10+
#include "chrome/browser/ui/libgtkui/app_indicator_icon.h"
11+
#include "chrome/browser/ui/libgtkui/gtk_status_icon.h"
1212
#include "ui/gfx/image/image.h"
1313

1414
namespace atom {
@@ -33,15 +33,15 @@ void TrayIconGtk::SetImage(const gfx::Image& image) {
3333
}
3434

3535
base::string16 empty;
36-
if (libgtk2ui::AppIndicatorIcon::CouldOpen()) {
36+
if (libgtkui::AppIndicatorIcon::CouldOpen()) {
3737
++indicators_count;
38-
icon_.reset(new libgtk2ui::AppIndicatorIcon(
38+
icon_.reset(new libgtkui::AppIndicatorIcon(
3939
base::StringPrintf(
4040
"%s%d", Browser::Get()->GetName().c_str(), indicators_count),
4141
image.AsImageSkia(),
4242
empty));
4343
} else {
44-
icon_.reset(new libgtk2ui::Gtk2StatusIcon(image.AsImageSkia(), empty));
44+
icon_.reset(new libgtkui::Gtk2StatusIcon(image.AsImageSkia(), empty));
4545
}
4646
icon_->set_delegate(this);
4747
}

‎atom/browser/ui/views/menu_bar.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#if defined(OS_WIN)
1818
#include "ui/gfx/color_utils.h"
1919
#elif defined(USE_X11)
20-
#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
20+
#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
2121
#endif
2222

2323
namespace atom {
@@ -35,11 +35,11 @@ void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
3535
GtkWidget* menu_bar = gtk_menu_bar_new();
3636

3737
GtkStyle* style = gtk_rc_get_style(menu_bar);
38-
*enabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
39-
*disabled = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
40-
*highlight = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
41-
*hover = libgtk2ui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
42-
*background = libgtk2ui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
38+
*enabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_NORMAL]);
39+
*disabled = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_INSENSITIVE]);
40+
*highlight = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_SELECTED]);
41+
*hover = libgtkui::GdkColorToSkColor(style->fg[GTK_STATE_PRELIGHT]);
42+
*background = libgtkui::GdkColorToSkColor(style->bg[GTK_STATE_NORMAL]);
4343

4444
gtk_widget_destroy(menu_bar);
4545
}

‎atom/common/chrome_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef ATOM_COMMON_CHROME_VERSION_H_
99
#define ATOM_COMMON_CHROME_VERSION_H_
1010

11-
#define CHROME_VERSION_STRING "56.0.2924.59"
11+
#define CHROME_VERSION_STRING "56.0.2924.67"
1212
#define CHROME_VERSION "v" CHROME_VERSION_STRING
1313

1414
#endif // ATOM_COMMON_CHROME_VERSION_H_

‎script/lib/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
1010
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
1111
LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
12-
'b71afafe59998daf0cb275b50140378b8c88b101'
12+
'0360b49dc59dcaad80bc056c9c9678273d4200e6'
1313

1414
PLATFORM = {
1515
'cygwin': 'win32',

0 commit comments

Comments
 (0)