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

Side by Side 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: sky review Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h" 5 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
6 6
7 #include "chrome/browser/extensions/extension_browser_event_router.h" 7 #include "chrome/browser/extensions/extension_browser_event_router.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/extensions/extension.h" 10 #include "chrome/common/extensions/extension.h"
11 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
11 12
12 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk( 13 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(
13 Profile* profile, gfx::NativeWindow window) 14 Profile* profile, gfx::NativeWindow window)
14 : ExtensionKeybindingRegistry(profile), 15 : ExtensionKeybindingRegistry(profile),
15 profile_(profile), 16 profile_(profile),
16 window_(window), 17 window_(window),
17 accel_group_(NULL) { 18 accel_group_(NULL) {
18 Init(); 19 Init();
19 } 20 }
20 21
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (it == event_targets_.end()) { 107 if (it == event_targets_.end()) {
107 NOTREACHED(); // Shouldn't get this event for something not registered. 108 NOTREACHED(); // Shouldn't get this event for something not registered.
108 return FALSE; 109 return FALSE;
109 } 110 }
110 111
111 service->browser_event_router()->CommandExecuted( 112 service->browser_event_router()->CommandExecuted(
112 profile_, it->second.first, it->second.second); 113 profile_, it->second.first, it->second.second);
113 114
114 return TRUE; 115 return TRUE;
115 } 116 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/global_menu_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698