diff options
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/global_menu_bar.cc | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 2c3f8d8..588def4 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" diff --git a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc index 4ec31e7..dfa1c87 100644 --- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc @@ -8,6 +8,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" +#include "ui/base/keycodes/keyboard_code_conversion_gtk.h" ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk( Profile* profile, gfx::NativeWindow window) diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc index 7916916..8eef865 100644 --- a/chrome/browser/ui/gtk/global_menu_bar.cc +++ b/chrome/browser/ui/gtk/global_menu_bar.cc @@ -174,15 +174,15 @@ GlobalMenuBar::GlobalMenuBar(Browser* browser) browser_->command_updater()->IsCommandEnabled(it->first)); // Set the accelerator for each menu item. - const ui::AcceleratorGtk* accelerator_gtk = - AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand( - it->first); - if (accelerator_gtk) { + AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance(); + const ui::AcceleratorGtk* accelerator = + accelerators->GetPrimaryAcceleratorForCommand(it->first); + if (accelerator) { gtk_widget_add_accelerator(it->second, "activate", dummy_accel_group_, - accelerator_gtk->GetGdkKeyCode(), - accelerator_gtk->gdk_modifier_type(), + accelerator->GetGdkKeyCode(), + accelerator->gdk_modifier_type(), GTK_ACCEL_VISIBLE); } |