| Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| index 59ec6452e6e03da65ca2b4a84d5e2ac162e7103a..ce8d004fc06a127eb9ed2533f1acf79b1980b745 100644
|
| --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
|
| @@ -4,8 +4,9 @@
|
|
|
| #include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
|
|
|
| -#include <algorithm>
|
| #include <gtk/gtk.h>
|
| +
|
| +#include <algorithm>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -31,8 +32,8 @@
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_action.h"
|
| +#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/extensions/extension_resource.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_source.h"
|
| @@ -398,7 +399,7 @@ class BrowserActionButton : public content::NotificationObserver,
|
| gtk_accel_group_connect(
|
| accel_group_,
|
| keybinding_.get()->GetGdkKeyCode(),
|
| - keybinding_.get()->gdk_modifier_type(),
|
| + keybinding_.get()->GetGdkModifierType(),
|
| GtkAccelFlags(0),
|
| g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
|
|
|
|
|