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

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

Issue 155183002: Add ApiActivityMonitor to decouple ActivityLog from low-level extensions code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase3 (activity_log) Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "chrome/browser/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/version.h" 8 #include "base/version.h"
9 #include "chrome/browser/app_mode/app_mode_utils.h" 9 #include "chrome/browser/app_mode/app_mode_utils.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/extensions/activity_log/activity_log.h"
11 #include "chrome/browser/extensions/chrome_app_sorting.h" 12 #include "chrome/browser/extensions/chrome_app_sorting.h"
12 #include "chrome/browser/extensions/extension_system_factory.h" 13 #include "chrome/browser/extensions/extension_system_factory.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 16 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
16 #include "chrome/browser/ui/browser_finder.h" 17 #include "chrome/browser/ui/browser_finder.h"
17 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 18 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
18 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/chrome_version_info.h" 20 #include "chrome/common/chrome_version_info.h"
20 #include "chrome/common/extensions/features/feature_channel.h" 21 #include "chrome/common/extensions/features/feature_channel.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 162
162 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() { 163 bool ChromeExtensionsBrowserClient::IsRunningInForcedAppMode() {
163 return chrome::IsRunningInForcedAppMode(); 164 return chrome::IsRunningInForcedAppMode();
164 } 165 }
165 166
166 content::JavaScriptDialogManager* 167 content::JavaScriptDialogManager*
167 ChromeExtensionsBrowserClient::GetJavaScriptDialogManager() { 168 ChromeExtensionsBrowserClient::GetJavaScriptDialogManager() {
168 return GetJavaScriptDialogManagerInstance(); 169 return GetJavaScriptDialogManagerInstance();
169 } 170 }
170 171
172 ApiActivityMonitor* ChromeExtensionsBrowserClient::GetApiActivityMonitor(
173 content::BrowserContext* context) {
174 // The ActivityLog monitors and records function calls and events.
175 return ActivityLog::GetInstance(context);
176 }
177
171 std::vector<BrowserContextKeyedServiceFactory*> 178 std::vector<BrowserContextKeyedServiceFactory*>
172 ChromeExtensionsBrowserClient::GetExtensionSystemDependencies() { 179 ChromeExtensionsBrowserClient::GetExtensionSystemDependencies() {
173 std::vector<BrowserContextKeyedServiceFactory*> dependencies; 180 std::vector<BrowserContextKeyedServiceFactory*> dependencies;
174 dependencies.push_back(ExtensionSystemSharedFactory::GetInstance()); 181 dependencies.push_back(ExtensionSystemSharedFactory::GetInstance());
175 return dependencies; 182 return dependencies;
176 } 183 }
177 184
178 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem( 185 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem(
179 content::BrowserContext* context) { 186 content::BrowserContext* context) {
180 return new ExtensionSystemImpl(static_cast<Profile*>(context)); 187 return new ExtensionSystemImpl(static_cast<Profile*>(context));
181 } 188 }
182 189
183 } // namespace extensions 190 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698