Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Unified Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

Issue 9965049: ui/base: Clean up our AcceleratorGtk class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
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 4024a7caaba9ecb06c9ff1246e329a3e084e0047..725dca23cefc3fad04cd53a60236fdab4836d8ac 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)
@@ -64,7 +65,7 @@ void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(
gtk_accel_group_connect(
accel_group_,
accelerator.GetGdkKeyCode(),
- accelerator.gdk_modifier_type(),
+ accelerator.GetGdkModifierType(),
GtkAccelFlags(0),
g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL));
}
@@ -87,7 +88,7 @@ void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybinding(
gtk_accel_group_disconnect_key(accel_group_,
iter->first.GetGdkKeyCode(),
- iter->first.gdk_modifier_type());
+ iter->first.GetGdkModifierType());
EventTargets::iterator old = iter++;
event_targets_.erase(old);
}

Powered by Google App Engine
This is Rietveld 408576698