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

Side by Side Diff: apps/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: Better comments Created 6 years, 5 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 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 "apps/shell/browser/shell_browser_main_parts.h" 5 #include "apps/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "apps/shell/browser/shell_browser_context.h" 7 #include "apps/shell/browser/shell_browser_context.h"
8 #include "apps/shell/browser/shell_browser_main_delegate.h" 8 #include "apps/shell/browser/shell_browser_main_delegate.h"
9 #include "apps/shell/browser/shell_desktop_controller.h" 9 #include "apps/shell/browser/shell_desktop_controller.h"
10 #include "apps/shell/browser/shell_extension_system.h" 10 #include "apps/shell/browser/shell_extension_system.h"
11 #include "apps/shell/browser/shell_extension_system_factory.h" 11 #include "apps/shell/browser/shell_extension_system_factory.h"
12 #include "apps/shell/browser/shell_extensions_browser_client.h" 12 #include "apps/shell/browser/shell_extensions_browser_client.h"
13 #include "apps/shell/browser/shell_omaha_query_params_delegate.h" 13 #include "apps/shell/browser/shell_omaha_query_params_delegate.h"
14 #include "apps/shell/common/shell_extensions_client.h" 14 #include "apps/shell/common/shell_extensions_client.h"
15 #include "apps/shell/common/switches.h" 15 #include "apps/shell/common/switches.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/run_loop.h" 17 #include "base/run_loop.h"
18 #include "components/keyed_service/content/browser_context_dependency_manager.h" 18 #include "components/keyed_service/content/browser_context_dependency_manager.h"
19 #include "components/omaha_query_params/omaha_query_params.h" 19 #include "components/omaha_query_params/omaha_query_params.h"
20 #include "content/public/common/result_codes.h" 20 #include "content/public/common/result_codes.h"
21 #include "content/shell/browser/shell_devtools_delegate.h" 21 #include "content/shell/browser/shell_devtools_delegate.h"
22 #include "content/shell/browser/shell_net_log.h" 22 #include "content/shell/browser/shell_net_log.h"
23 #include "extensions/browser/browser_context_keyed_service_factories.h" 23 #include "extensions/browser/browser_context_keyed_service_factories.h"
24 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
25 #include "ui/aura/window_tree_host.h" 25 #include "ui/aura/window_tree_host.h"
26 #include "ui/base/ime/input_method_initializer.h" 26 #include "ui/base/ime/input_method_initializer.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 28
29 #if !defined(OS_ANDROID) && !defined(OS_IOS)
30 #include "components/storage_monitor/storage_monitor.h"
31 #endif
32
29 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
30 #include "apps/shell/browser/shell_network_controller_chromeos.h" 34 #include "apps/shell/browser/shell_network_controller_chromeos.h"
31 #include "chromeos/dbus/dbus_thread_manager.h" 35 #include "chromeos/dbus/dbus_thread_manager.h"
32 #endif 36 #endif
33 37
34 using content::BrowserContext; 38 using content::BrowserContext;
35 using extensions::Extension; 39 using extensions::Extension;
36 using extensions::ExtensionSystem; 40 using extensions::ExtensionSystem;
37 using extensions::ShellExtensionSystem; 41 using extensions::ShellExtensionSystem;
38 42
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 devtools_delegate_.reset( 126 devtools_delegate_.reset(
123 new content::ShellDevToolsDelegate(browser_context_.get())); 127 new content::ShellDevToolsDelegate(browser_context_.get()));
124 if (parameters_.ui_task) { 128 if (parameters_.ui_task) {
125 // For running browser tests. 129 // For running browser tests.
126 parameters_.ui_task->Run(); 130 parameters_.ui_task->Run();
127 delete parameters_.ui_task; 131 delete parameters_.ui_task;
128 run_message_loop_ = false; 132 run_message_loop_ = false;
129 } else { 133 } else {
130 browser_main_delegate_->Start(browser_context_.get()); 134 browser_main_delegate_->Start(browser_context_.get());
131 } 135 }
136
137 #if !defined(OS_ANDROID) && !defined(OS_IOS)
138 storage_monitor::StorageMonitor::Create();
139 #endif
132 } 140 }
133 141
134 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { 142 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
135 if (!run_message_loop_) 143 if (!run_message_loop_)
136 return true; 144 return true;
137 // TODO(yoz): just return false here? 145 // TODO(yoz): just return false here?
138 base::RunLoop run_loop; 146 base::RunLoop run_loop;
139 run_loop.Run(); 147 run_loop.Run();
140 *result_code = content::RESULT_CODE_NORMAL_EXIT; 148 *result_code = content::RESULT_CODE_NORMAL_EXIT;
141 return true; 149 return true;
142 } 150 }
143 151
144 void ShellBrowserMainParts::PostMainMessageLoopRun() { 152 void ShellBrowserMainParts::PostMainMessageLoopRun() {
145 browser_main_delegate_->Shutdown(); 153 browser_main_delegate_->Shutdown();
146 154
147 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 155 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
148 browser_context_.get()); 156 browser_context_.get());
149 extension_system_ = NULL; 157 extension_system_ = NULL;
150 extensions::ExtensionsBrowserClient::Set(NULL); 158 extensions::ExtensionsBrowserClient::Set(NULL);
151 extensions_browser_client_.reset(); 159 extensions_browser_client_.reset();
152 browser_context_.reset(); 160 browser_context_.reset();
153 161
154 desktop_controller_.reset(); 162 desktop_controller_.reset();
163
164 #if !defined(OS_ANDROID) && !defined(OS_IOS)
165 storage_monitor::StorageMonitor::Destroy();
166 #endif
155 } 167 }
156 168
157 void ShellBrowserMainParts::PostDestroyThreads() { 169 void ShellBrowserMainParts::PostDestroyThreads() {
158 #if defined(OS_CHROMEOS) 170 #if defined(OS_CHROMEOS)
159 network_controller_.reset(); 171 network_controller_.reset();
160 chromeos::DBusThreadManager::Shutdown(); 172 chromeos::DBusThreadManager::Shutdown();
161 #endif 173 #endif
162 } 174 }
163 175
164 void ShellBrowserMainParts::CreateExtensionSystem() { 176 void ShellBrowserMainParts::CreateExtensionSystem() {
165 DCHECK(browser_context_); 177 DCHECK(browser_context_);
166 extension_system_ = static_cast<ShellExtensionSystem*>( 178 extension_system_ = static_cast<ShellExtensionSystem*>(
167 ExtensionSystem::Get(browser_context_.get())); 179 ExtensionSystem::Get(browser_context_.get()));
168 extension_system_->InitForRegularProfile(true); 180 extension_system_->InitForRegularProfile(true);
169 } 181 }
170 182
171 } // namespace apps 183 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698