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

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

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_COMMANDS_GLOBAL_REGISTRY_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_
6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_ 6 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 friend class BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry>; 65 friend class BrowserContextKeyedAPIFactory<ExtensionCommandsGlobalRegistry>;
66 66
67 // BrowserContextKeyedAPI implementation. 67 // BrowserContextKeyedAPI implementation.
68 static const char* service_name() { 68 static const char* service_name() {
69 return "ExtensionCommandsGlobalRegistry"; 69 return "ExtensionCommandsGlobalRegistry";
70 } 70 }
71 71
72 // Overridden from ExtensionKeybindingRegistry: 72 // Overridden from ExtensionKeybindingRegistry:
73 virtual void AddExtensionKeybinding( 73 virtual void AddExtensionKeybinding(
74 const Extension* extension, 74 const Extension* extension,
75 const std::string& command_name) OVERRIDE; 75 const std::string& command_name) override;
76 virtual void RemoveExtensionKeybindingImpl( 76 virtual void RemoveExtensionKeybindingImpl(
77 const ui::Accelerator& accelerator, 77 const ui::Accelerator& accelerator,
78 const std::string& command_name) OVERRIDE; 78 const std::string& command_name) override;
79 79
80 // Called by the GlobalShortcutListener object when a shortcut this class has 80 // Called by the GlobalShortcutListener object when a shortcut this class has
81 // registered for has been pressed. 81 // registered for has been pressed.
82 virtual void OnKeyPressed(const ui::Accelerator& accelerator) OVERRIDE; 82 virtual void OnKeyPressed(const ui::Accelerator& accelerator) override;
83 83
84 // Weak pointer to our browser context. Not owned by us. 84 // Weak pointer to our browser context. Not owned by us.
85 content::BrowserContext* browser_context_; 85 content::BrowserContext* browser_context_;
86 86
87 // The global commands registry not only keeps track of global commands 87 // The global commands registry not only keeps track of global commands
88 // registered, but also of which non-global command registry is active 88 // registered, but also of which non-global command registry is active
89 // (belonging to the currently active window). Only valid for TOOLKIT_VIEWS 89 // (belonging to the currently active window). Only valid for TOOLKIT_VIEWS
90 // and 90 // and
91 // NULL otherwise. 91 // NULL otherwise.
92 ExtensionKeybindingRegistry* registry_for_active_window_; 92 ExtensionKeybindingRegistry* registry_for_active_window_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(ExtensionCommandsGlobalRegistry); 94 DISALLOW_COPY_AND_ASSIGN(ExtensionCommandsGlobalRegistry);
95 }; 95 };
96 96
97 } // namespace extensions 97 } // namespace extensions
98 98
99 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_ 99 #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMANDS_GLOBAL_REGISTRY_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_context_menu_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698