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

Side by Side Diff: extensions/shell/browser/shell_browser_main_parts.cc

Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 1 month 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
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | extensions/strings/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_browser_main_parts.h" 5 #include "extensions/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 9 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 #include "components/omaha_query_params/omaha_query_params.h" 10 #include "components/omaha_query_params/omaha_query_params.h"
11 #include "components/storage_monitor/storage_monitor.h"
11 #include "content/public/browser/child_process_security_policy.h" 12 #include "content/public/browser/child_process_security_policy.h"
12 #include "content/public/browser/context_factory.h" 13 #include "content/public/browser/context_factory.h"
13 #include "content/public/common/result_codes.h" 14 #include "content/public/common/result_codes.h"
14 #include "content/shell/browser/shell_devtools_delegate.h" 15 #include "content/shell/browser/shell_devtools_delegate.h"
15 #include "content/shell/browser/shell_net_log.h" 16 #include "content/shell/browser/shell_net_log.h"
16 #include "extensions/browser/app_window/app_window_client.h" 17 #include "extensions/browser/app_window/app_window_client.h"
17 #include "extensions/browser/browser_context_keyed_service_factories.h" 18 #include "extensions/browser/browser_context_keyed_service_factories.h"
18 #include "extensions/browser/extension_system.h" 19 #include "extensions/browser/extension_system.h"
19 #include "extensions/common/constants.h" 20 #include "extensions/common/constants.h"
20 #include "extensions/common/switches.h" 21 #include "extensions/common/switches.h"
21 #include "extensions/shell/browser/shell_browser_context.h" 22 #include "extensions/shell/browser/shell_browser_context.h"
22 #include "extensions/shell/browser/shell_browser_main_delegate.h" 23 #include "extensions/shell/browser/shell_browser_main_delegate.h"
23 #include "extensions/shell/browser/shell_desktop_controller.h" 24 #include "extensions/shell/browser/shell_desktop_controller.h"
24 #include "extensions/shell/browser/shell_device_client.h" 25 #include "extensions/shell/browser/shell_device_client.h"
25 #include "extensions/shell/browser/shell_extension_system.h" 26 #include "extensions/shell/browser/shell_extension_system.h"
26 #include "extensions/shell/browser/shell_extension_system_factory.h" 27 #include "extensions/shell/browser/shell_extension_system_factory.h"
27 #include "extensions/shell/browser/shell_extensions_browser_client.h" 28 #include "extensions/shell/browser/shell_extensions_browser_client.h"
28 #include "extensions/shell/browser/shell_oauth2_token_service.h" 29 #include "extensions/shell/browser/shell_oauth2_token_service.h"
29 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h" 30 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
30 #include "extensions/shell/common/shell_extensions_client.h" 31 #include "extensions/shell/common/shell_extensions_client.h"
31 #include "extensions/shell/common/switches.h" 32 #include "extensions/shell/common/switches.h"
32 #include "ui/aura/env.h" 33 #include "ui/aura/env.h"
33 #include "ui/aura/window_tree_host.h" 34 #include "ui/aura/window_tree_host.h"
34 #include "ui/base/ime/input_method_initializer.h" 35 #include "ui/base/ime/input_method_initializer.h"
35 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
36 37
37 #if !defined(OS_ANDROID) && !defined(OS_IOS)
38 #include "components/storage_monitor/storage_monitor.h"
39 #endif
40
41 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
42 #include "chromeos/audio/cras_audio_handler.h" 39 #include "chromeos/audio/cras_audio_handler.h"
43 #include "chromeos/dbus/dbus_thread_manager.h" 40 #include "chromeos/dbus/dbus_thread_manager.h"
44 #include "chromeos/network/network_handler.h" 41 #include "chromeos/network/network_handler.h"
45 #include "extensions/shell/browser/shell_audio_controller_chromeos.h" 42 #include "extensions/shell/browser/shell_audio_controller_chromeos.h"
46 #include "extensions/shell/browser/shell_network_controller_chromeos.h" 43 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
47 #endif 44 #endif
48 45
49 #if !defined(DISABLE_NACL) 46 #if !defined(DISABLE_NACL)
50 #include "components/nacl/browser/nacl_browser.h" 47 #include "components/nacl/browser/nacl_browser.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // Return no error. 110 // Return no error.
114 return 0; 111 return 0;
115 } 112 }
116 113
117 void ShellBrowserMainParts::PreMainMessageLoopRun() { 114 void ShellBrowserMainParts::PreMainMessageLoopRun() {
118 // Initialize our "profile" equivalent. 115 // Initialize our "profile" equivalent.
119 browser_context_.reset(new ShellBrowserContext(net_log_.get())); 116 browser_context_.reset(new ShellBrowserContext(net_log_.get()));
120 117
121 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory()); 118 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
122 119
123 #if !defined(OS_ANDROID) && !defined(OS_IOS)
124 storage_monitor::StorageMonitor::Create(); 120 storage_monitor::StorageMonitor::Create();
125 #endif
126 121
127 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); 122 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
128 123
129 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc 124 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
130 // TODO(jamescook): Initialize user_manager::UserManager. 125 // TODO(jamescook): Initialize user_manager::UserManager.
131 net_log_.reset(new content::ShellNetLog("app_shell")); 126 net_log_.reset(new content::ShellNetLog("app_shell"));
132 127
133 device_client_.reset(new ShellDeviceClient); 128 device_client_.reset(new ShellDeviceClient);
134 129
135 extensions_client_.reset(new ShellExtensionsClient()); 130 extensions_client_.reset(new ShellExtensionsClient());
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 oauth2_token_service_.reset(); 203 oauth2_token_service_.reset();
209 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 204 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
210 browser_context_.get()); 205 browser_context_.get());
211 extension_system_ = NULL; 206 extension_system_ = NULL;
212 ExtensionsBrowserClient::Set(NULL); 207 ExtensionsBrowserClient::Set(NULL);
213 extensions_browser_client_.reset(); 208 extensions_browser_client_.reset();
214 browser_context_.reset(); 209 browser_context_.reset();
215 210
216 desktop_controller_.reset(); 211 desktop_controller_.reset();
217 212
218 #if !defined(OS_ANDROID) && !defined(OS_IOS)
219 storage_monitor::StorageMonitor::Destroy(); 213 storage_monitor::StorageMonitor::Destroy();
220 #endif
221 } 214 }
222 215
223 void ShellBrowserMainParts::PostDestroyThreads() { 216 void ShellBrowserMainParts::PostDestroyThreads() {
224 #if defined(OS_CHROMEOS) 217 #if defined(OS_CHROMEOS)
225 audio_controller_.reset(); 218 audio_controller_.reset();
226 chromeos::CrasAudioHandler::Shutdown(); 219 chromeos::CrasAudioHandler::Shutdown();
227 network_controller_.reset(); 220 network_controller_.reset();
228 chromeos::NetworkHandler::Shutdown(); 221 chromeos::NetworkHandler::Shutdown();
229 chromeos::DBusThreadManager::Shutdown(); 222 chromeos::DBusThreadManager::Shutdown();
230 #endif 223 #endif
231 } 224 }
232 225
233 void ShellBrowserMainParts::CreateExtensionSystem() { 226 void ShellBrowserMainParts::CreateExtensionSystem() {
234 DCHECK(browser_context_); 227 DCHECK(browser_context_);
235 extension_system_ = static_cast<ShellExtensionSystem*>( 228 extension_system_ = static_cast<ShellExtensionSystem*>(
236 ExtensionSystem::Get(browser_context_.get())); 229 ExtensionSystem::Get(browser_context_.get()));
237 extension_system_->InitForRegularProfile(true); 230 extension_system_->InitForRegularProfile(true);
238 } 231 }
239 232
240 } // namespace extensions 233 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/BUILD.gn ('k') | extensions/strings/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698