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

Side by Side Diff: chrome/common/extensions/api/commands/commands_handler.h

Issue 622373003: Replacing the OVERRIDE with override in chrome/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved Error 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_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_ 5 #ifndef CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_
6 #define CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_ 6 #define CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 static const Command* GetPageActionCommand(const Extension* extension); 31 static const Command* GetPageActionCommand(const Extension* extension);
32 static const CommandMap* GetNamedCommands(const Extension* extension); 32 static const CommandMap* GetNamedCommands(const Extension* extension);
33 }; 33 };
34 34
35 // Parses the "commands" manifest key. 35 // Parses the "commands" manifest key.
36 class CommandsHandler : public ManifestHandler { 36 class CommandsHandler : public ManifestHandler {
37 public: 37 public:
38 CommandsHandler(); 38 CommandsHandler();
39 virtual ~CommandsHandler(); 39 virtual ~CommandsHandler();
40 40
41 virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE; 41 virtual bool Parse(Extension* extension, base::string16* error) override;
42 virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE; 42 virtual bool AlwaysParseForType(Manifest::Type type) const override;
43 43
44 private: 44 private:
45 // If the extension defines a browser action, but no command for it, then 45 // If the extension defines a browser action, but no command for it, then
46 // we synthesize a generic one, so the user can configure a shortcut for it. 46 // we synthesize a generic one, so the user can configure a shortcut for it.
47 // No keyboard shortcut will be assigned to it, until the user selects one. 47 // No keyboard shortcut will be assigned to it, until the user selects one.
48 void MaybeSetBrowserActionDefault(const Extension* extension, 48 void MaybeSetBrowserActionDefault(const Extension* extension,
49 CommandsInfo* info); 49 CommandsInfo* info);
50 50
51 virtual const std::vector<std::string> Keys() const OVERRIDE; 51 virtual const std::vector<std::string> Keys() const override;
52 52
53 DISALLOW_COPY_AND_ASSIGN(CommandsHandler); 53 DISALLOW_COPY_AND_ASSIGN(CommandsHandler);
54 }; 54 };
55 55
56 } // namespace extensions 56 } // namespace extensions
57 57
58 #endif // CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_ 58 #endif // CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/common/crash_keys_unittest.cc ('k') | chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698