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

Side by Side Diff: chrome/browser/extensions/extension_action_manager.cc

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) 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/extensions/extension_action_manager.h" 5 #include "chrome/browser/extensions/extension_action_manager.h"
6 6
7 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage r_factory.h" 7 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manage r_factory.h"
8 #include "chrome/browser/extensions/extension_action.h" 8 #include "chrome/browser/extensions/extension_action.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" 10 #include "components/keyed_service/content/browser_context_dependency_manager.h"
(...skipping 22 matching lines...) Expand all
33 private: 33 private:
34 friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>; 34 friend struct DefaultSingletonTraits<ExtensionActionManagerFactory>;
35 35
36 ExtensionActionManagerFactory() 36 ExtensionActionManagerFactory()
37 : BrowserContextKeyedServiceFactory( 37 : BrowserContextKeyedServiceFactory(
38 "ExtensionActionManager", 38 "ExtensionActionManager",
39 BrowserContextDependencyManager::GetInstance()) { 39 BrowserContextDependencyManager::GetInstance()) {
40 } 40 }
41 41
42 virtual KeyedService* BuildServiceInstanceFor( 42 virtual KeyedService* BuildServiceInstanceFor(
43 content::BrowserContext* profile) const OVERRIDE { 43 content::BrowserContext* profile) const override {
44 return new ExtensionActionManager(static_cast<Profile*>(profile)); 44 return new ExtensionActionManager(static_cast<Profile*>(profile));
45 } 45 }
46 46
47 virtual content::BrowserContext* GetBrowserContextToUse( 47 virtual content::BrowserContext* GetBrowserContextToUse(
48 content::BrowserContext* context) const OVERRIDE { 48 content::BrowserContext* context) const override {
49 return ExtensionsBrowserClient::Get()->GetOriginalContext(context); 49 return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
50 } 50 }
51 }; 51 };
52 52
53 ExtensionActionManagerFactory* 53 ExtensionActionManagerFactory*
54 ExtensionActionManagerFactory::GetInstance() { 54 ExtensionActionManagerFactory::GetInstance() {
55 return Singleton<ExtensionActionManagerFactory>::get(); 55 return Singleton<ExtensionActionManagerFactory>::get();
56 } 56 }
57 57
58 } // namespace 58 } // namespace
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 profile_); 201 profile_);
202 } 202 }
203 203
204 ExtensionAction* ExtensionActionManager::GetExtensionAction( 204 ExtensionAction* ExtensionActionManager::GetExtensionAction(
205 const Extension& extension) const { 205 const Extension& extension) const {
206 ExtensionAction* action = GetBrowserAction(extension); 206 ExtensionAction* action = GetBrowserAction(extension);
207 return action ? action : GetPageAction(extension); 207 return action ? action : GetPageAction(extension);
208 } 208 }
209 209
210 } // namespace extensions 210 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_action_manager.h ('k') | chrome/browser/extensions/extension_action_storage_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698