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

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

Issue 181233011: Revert of Add ExtensionsApiClient interface, use it in the storage API SettingsFrontend (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/activity_log/activity_log.h"
12 #include "chrome/browser/extensions/chrome_app_sorting.h" 12 #include "chrome/browser/extensions/chrome_app_sorting.h"
13 #include "chrome/browser/extensions/extension_host.h" 13 #include "chrome/browser/extensions/extension_host.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_system_factory.h" 15 #include "chrome/browser/extensions/extension_system_factory.h"
16 #include "chrome/browser/extensions/extension_util.h" 16 #include "chrome/browser/extensions/extension_util.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h" 19 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
20 #include "chrome/browser/ui/browser_finder.h" 20 #include "chrome/browser/ui/browser_finder.h"
21 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 21 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
24 #include "chrome/common/extensions/features/feature_channel.h" 24 #include "chrome/common/extensions/features/feature_channel.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "extensions/browser/extension_prefs.h" 26 #include "extensions/browser/extension_prefs.h"
27 #include "extensions/browser/extension_system.h" 27 #include "extensions/browser/extension_system.h"
28 #include "extensions/browser/pref_names.h" 28 #include "extensions/browser/pref_names.h"
29 29
30 #if !defined(OS_ANDROID)
31 #include "chrome/browser/extensions/api/chrome_extensions_api_client.h"
32 #endif
33
34 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
35 #include "chromeos/chromeos_switches.h" 31 #include "chromeos/chromeos_switches.h"
36 #endif 32 #endif
37 33
38 namespace extensions { 34 namespace extensions {
39 35
40 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { 36 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
41 #if !defined(OS_ANDROID)
42 api_client_.reset(new ChromeExtensionsAPIClient);
43 #endif
44 // Only set if it hasn't already been set (e.g. by a test). 37 // Only set if it hasn't already been set (e.g. by a test).
45 if (GetCurrentChannel() == GetDefaultChannel()) 38 if (GetCurrentChannel() == GetDefaultChannel())
46 SetCurrentChannel(chrome::VersionInfo::GetChannel()); 39 SetCurrentChannel(chrome::VersionInfo::GetChannel());
47 } 40 }
48 41
49 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {} 42 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
50 43
51 bool ChromeExtensionsBrowserClient::IsShuttingDown() { 44 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
52 return g_browser_process->IsShuttingDown(); 45 return g_browser_process->IsShuttingDown();
53 } 46 }
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // The ActivityLog monitors and records function calls and events. 198 // The ActivityLog monitors and records function calls and events.
206 return ActivityLog::GetInstance(context); 199 return ActivityLog::GetInstance(context);
207 } 200 }
208 201
209 ExtensionSystemProvider* 202 ExtensionSystemProvider*
210 ChromeExtensionsBrowserClient::GetExtensionSystemFactory() { 203 ChromeExtensionsBrowserClient::GetExtensionSystemFactory() {
211 return ExtensionSystemFactory::GetInstance(); 204 return ExtensionSystemFactory::GetInstance();
212 } 205 }
213 206
214 } // namespace extensions 207 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698