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

Side by Side Diff: chrome/browser/extensions/extension_keybinding_registry.h

Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for ChromeOS (ash) Created 7 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
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 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "content/public/browser/notification_details.h" 11 #include "content/public/browser/notification_details.h"
12 #include "content/public/browser/notification_observer.h" 12 #include "content/public/browser/notification_observer.h"
13 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
14 #include "content/public/browser/notification_source.h" 14 #include "content/public/browser/notification_source.h"
15 15
16 class Profile; 16 class Profile;
17 17
18 namespace ui {
19 class Accelerator;
20 }
Finnur 2013/04/15 14:30:31 Already removed locally.
21
18 namespace extensions { 22 namespace extensions {
19 23
20 class ActiveTabPermissionGranter; 24 class ActiveTabPermissionGranter;
21 class Extension; 25 class Extension;
22 26
23 // The ExtensionKeybindingRegistry is a class that handles the cross-platform 27 // The ExtensionKeybindingRegistry is a class that handles the cross-platform
24 // logic for keyboard accelerators. See platform-specific implementations for 28 // logic for keyboard accelerators. See platform-specific implementations for
25 // implementation details for each platform. 29 // implementation details for each platform.
26 class ExtensionKeybindingRegistry : public content::NotificationObserver { 30 class ExtensionKeybindingRegistry : public content::NotificationObserver {
27 public: 31 public:
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 97
94 // Weak pointer to our delegate. Not owned by us. Must outlive this class. 98 // Weak pointer to our delegate. Not owned by us. Must outlive this class.
95 Delegate* delegate_; 99 Delegate* delegate_;
96 100
97 DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistry); 101 DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistry);
98 }; 102 };
99 103
100 } // namespace extensions 104 } // namespace extensions
101 105
102 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_ 106 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698