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

Side by Side Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "chrome/browser/extensions/api/commands/command_service.h" 9 #include "chrome/browser/extensions/api/commands/command_service.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/extensions/extension.h" 12 #include "extensions/common/extension.h"
13 #include "ui/base/accelerators/platform_accelerator_gtk.h" 13 #include "ui/base/accelerators/platform_accelerator_gtk.h"
14 14
15 // static 15 // static
16 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( 16 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
17 bool suspended) { 17 bool suspended) {
18 ExtensionKeybindingRegistryGtk::set_shortcut_handling_suspended(suspended); 18 ExtensionKeybindingRegistryGtk::set_shortcut_handling_suspended(suspended);
19 } 19 }
20 20
21 bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false; 21 bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false;
22 22
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 EventTargets::iterator it = event_targets_.find(accelerator); 152 EventTargets::iterator it = event_targets_.find(accelerator);
153 if (it == event_targets_.end()) { 153 if (it == event_targets_.end()) {
154 NOTREACHED(); // Shouldn't get this event for something not registered. 154 NOTREACHED(); // Shouldn't get this event for something not registered.
155 return FALSE; 155 return FALSE;
156 } 156 }
157 157
158 CommandExecuted(it->second.first, it->second.second); 158 CommandExecuted(it->second.first, it->second.second);
159 return TRUE; 159 return TRUE;
160 } 160 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698