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

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

Issue 507503002: Remove BrowserThread dependency from usb_service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move device/common to device/core. 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
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 "content/public/browser/context_factory.h" 11 #include "content/public/browser/context_factory.h"
12 #include "content/public/common/result_codes.h" 12 #include "content/public/common/result_codes.h"
13 #include "content/shell/browser/shell_devtools_delegate.h" 13 #include "content/shell/browser/shell_devtools_delegate.h"
14 #include "content/shell/browser/shell_net_log.h" 14 #include "content/shell/browser/shell_net_log.h"
15 #include "extensions/browser/browser_context_keyed_service_factories.h" 15 #include "extensions/browser/browser_context_keyed_service_factories.h"
16 #include "extensions/browser/extension_system.h" 16 #include "extensions/browser/extension_system.h"
17 #include "extensions/shell/browser/shell_browser_context.h" 17 #include "extensions/shell/browser/shell_browser_context.h"
18 #include "extensions/shell/browser/shell_browser_main_delegate.h" 18 #include "extensions/shell/browser/shell_browser_main_delegate.h"
19 #include "extensions/shell/browser/shell_desktop_controller.h" 19 #include "extensions/shell/browser/shell_desktop_controller.h"
20 #include "extensions/shell/browser/shell_device_client.h"
20 #include "extensions/shell/browser/shell_extension_system.h" 21 #include "extensions/shell/browser/shell_extension_system.h"
21 #include "extensions/shell/browser/shell_extension_system_factory.h" 22 #include "extensions/shell/browser/shell_extension_system_factory.h"
22 #include "extensions/shell/browser/shell_extensions_browser_client.h" 23 #include "extensions/shell/browser/shell_extensions_browser_client.h"
23 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h" 24 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
24 #include "extensions/shell/common/shell_extensions_client.h" 25 #include "extensions/shell/common/shell_extensions_client.h"
25 #include "extensions/shell/common/switches.h" 26 #include "extensions/shell/common/switches.h"
26 #include "ui/aura/env.h" 27 #include "ui/aura/env.h"
27 #include "ui/aura/window_tree_host.h" 28 #include "ui/aura/window_tree_host.h"
28 #include "ui/base/ime/input_method_initializer.h" 29 #include "ui/base/ime/input_method_initializer.h"
29 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 browser_context_.reset(new ShellBrowserContext); 99 browser_context_.reset(new ShellBrowserContext);
99 100
100 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory()); 101 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
101 102
102 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); 103 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
103 104
104 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc 105 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
105 // TODO(jamescook): Initialize user_manager::UserManager. 106 // TODO(jamescook): Initialize user_manager::UserManager.
106 net_log_.reset(new content::ShellNetLog("app_shell")); 107 net_log_.reset(new content::ShellNetLog("app_shell"));
107 108
109 device_client_.reset(new ShellDeviceClient);
110
108 extensions_client_.reset(new ShellExtensionsClient()); 111 extensions_client_.reset(new ShellExtensionsClient());
109 ExtensionsClient::Set(extensions_client_.get()); 112 ExtensionsClient::Set(extensions_client_.get());
110 113
111 extensions_browser_client_.reset( 114 extensions_browser_client_.reset(
112 new ShellExtensionsBrowserClient(browser_context_.get())); 115 new ShellExtensionsBrowserClient(browser_context_.get()));
113 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 116 ExtensionsBrowserClient::Set(extensions_browser_client_.get());
114 117
115 omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate); 118 omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
116 omaha_query_params::OmahaQueryParams::SetDelegate( 119 omaha_query_params::OmahaQueryParams::SetDelegate(
117 omaha_query_params_delegate_.get()); 120 omaha_query_params_delegate_.get());
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 } 181 }
179 182
180 void ShellBrowserMainParts::CreateExtensionSystem() { 183 void ShellBrowserMainParts::CreateExtensionSystem() {
181 DCHECK(browser_context_); 184 DCHECK(browser_context_);
182 extension_system_ = static_cast<ShellExtensionSystem*>( 185 extension_system_ = static_cast<ShellExtensionSystem*>(
183 ExtensionSystem::Get(browser_context_.get())); 186 ExtensionSystem::Get(browser_context_.get()));
184 extension_system_->InitForRegularProfile(true); 187 extension_system_->InitForRegularProfile(true);
185 } 188 }
186 189
187 } // namespace extensions 190 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_browser_main_parts.h ('k') | extensions/shell/browser/shell_device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698