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

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

Issue 389633002: Move system.* family of APIs to extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 3 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
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | extensions/shell/browser/shell_display_info_provider.h » ('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"
(...skipping 11 matching lines...) Expand all
22 #include "extensions/shell/browser/shell_extension_system_factory.h" 22 #include "extensions/shell/browser/shell_extension_system_factory.h"
23 #include "extensions/shell/browser/shell_extensions_browser_client.h" 23 #include "extensions/shell/browser/shell_extensions_browser_client.h"
24 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h" 24 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
25 #include "extensions/shell/common/shell_extensions_client.h" 25 #include "extensions/shell/common/shell_extensions_client.h"
26 #include "extensions/shell/common/switches.h" 26 #include "extensions/shell/common/switches.h"
27 #include "ui/aura/env.h" 27 #include "ui/aura/env.h"
28 #include "ui/aura/window_tree_host.h" 28 #include "ui/aura/window_tree_host.h"
29 #include "ui/base/ime/input_method_initializer.h" 29 #include "ui/base/ime/input_method_initializer.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 #if !defined(OS_ANDROID) && !defined(OS_IOS)
33 #include "components/storage_monitor/storage_monitor.h"
34 #endif
35
32 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
33 #include "chromeos/audio/cras_audio_handler.h" 37 #include "chromeos/audio/cras_audio_handler.h"
34 #include "chromeos/dbus/dbus_thread_manager.h" 38 #include "chromeos/dbus/dbus_thread_manager.h"
35 #include "chromeos/network/network_handler.h" 39 #include "chromeos/network/network_handler.h"
36 #include "extensions/shell/browser/shell_audio_controller_chromeos.h" 40 #include "extensions/shell/browser/shell_audio_controller_chromeos.h"
37 #include "extensions/shell/browser/shell_network_controller_chromeos.h" 41 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
38 #endif 42 #endif
39 43
40 #if !defined(DISABLE_NACL) 44 #if !defined(DISABLE_NACL)
41 #include "components/nacl/browser/nacl_browser.h" 45 #include "components/nacl/browser/nacl_browser.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Return no error. 98 // Return no error.
95 return 0; 99 return 0;
96 } 100 }
97 101
98 void ShellBrowserMainParts::PreMainMessageLoopRun() { 102 void ShellBrowserMainParts::PreMainMessageLoopRun() {
99 // Initialize our "profile" equivalent. 103 // Initialize our "profile" equivalent.
100 browser_context_.reset(new ShellBrowserContext); 104 browser_context_.reset(new ShellBrowserContext);
101 105
102 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory()); 106 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
103 107
108 #if !defined(OS_ANDROID) && !defined(OS_IOS)
109 storage_monitor::StorageMonitor::Create();
110 #endif
111
104 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); 112 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
105 113
106 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc 114 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
107 // TODO(jamescook): Initialize user_manager::UserManager. 115 // TODO(jamescook): Initialize user_manager::UserManager.
108 net_log_.reset(new content::ShellNetLog("app_shell")); 116 net_log_.reset(new content::ShellNetLog("app_shell"));
109 117
110 device_client_.reset(new ShellDeviceClient); 118 device_client_.reset(new ShellDeviceClient);
111 119
112 extensions_client_.reset(new ShellExtensionsClient()); 120 extensions_client_.reset(new ShellExtensionsClient());
113 ExtensionsClient::Set(extensions_client_.get()); 121 ExtensionsClient::Set(extensions_client_.get());
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 browser_main_delegate_->Shutdown(); 177 browser_main_delegate_->Shutdown();
170 178
171 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 179 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
172 browser_context_.get()); 180 browser_context_.get());
173 extension_system_ = NULL; 181 extension_system_ = NULL;
174 ExtensionsBrowserClient::Set(NULL); 182 ExtensionsBrowserClient::Set(NULL);
175 extensions_browser_client_.reset(); 183 extensions_browser_client_.reset();
176 browser_context_.reset(); 184 browser_context_.reset();
177 185
178 desktop_controller_.reset(); 186 desktop_controller_.reset();
187
188 #if !defined(OS_ANDROID) && !defined(OS_IOS)
189 storage_monitor::StorageMonitor::Destroy();
190 #endif
179 } 191 }
180 192
181 void ShellBrowserMainParts::PostDestroyThreads() { 193 void ShellBrowserMainParts::PostDestroyThreads() {
182 #if defined(OS_CHROMEOS) 194 #if defined(OS_CHROMEOS)
183 audio_controller_.reset(); 195 audio_controller_.reset();
184 chromeos::CrasAudioHandler::Shutdown(); 196 chromeos::CrasAudioHandler::Shutdown();
185 network_controller_.reset(); 197 network_controller_.reset();
186 chromeos::NetworkHandler::Shutdown(); 198 chromeos::NetworkHandler::Shutdown();
187 chromeos::DBusThreadManager::Shutdown(); 199 chromeos::DBusThreadManager::Shutdown();
188 #endif 200 #endif
189 } 201 }
190 202
191 void ShellBrowserMainParts::CreateExtensionSystem() { 203 void ShellBrowserMainParts::CreateExtensionSystem() {
192 DCHECK(browser_context_); 204 DCHECK(browser_context_);
193 extension_system_ = static_cast<ShellExtensionSystem*>( 205 extension_system_ = static_cast<ShellExtensionSystem*>(
194 ExtensionSystem::Get(browser_context_.get())); 206 ExtensionSystem::Get(browser_context_.get()));
195 extension_system_->InitForRegularProfile(true); 207 extension_system_->InitForRegularProfile(true);
196 } 208 }
197 209
198 } // namespace extensions 210 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/app_shell.gyp ('k') | extensions/shell/browser/shell_display_info_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698