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

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

Issue 563083003: V2 app support step3: Athena's NativeAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #endif 118 #endif
119 119
120 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); 120 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
121 121
122 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc 122 // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
123 // TODO(jamescook): Initialize user_manager::UserManager. 123 // TODO(jamescook): Initialize user_manager::UserManager.
124 net_log_.reset(new content::ShellNetLog("app_shell")); 124 net_log_.reset(new content::ShellNetLog("app_shell"));
125 125
126 device_client_.reset(new ShellDeviceClient); 126 device_client_.reset(new ShellDeviceClient);
127 127
128 apps_client_.reset(browser_main_delegate_->CreateAppsClient());
129 extensions::AppsClient::Set(apps_client_.get());
130
131 extensions_client_.reset(new ShellExtensionsClient()); 128 extensions_client_.reset(new ShellExtensionsClient());
132 ExtensionsClient::Set(extensions_client_.get()); 129 ExtensionsClient::Set(extensions_client_.get());
133 130
134 extensions_browser_client_.reset( 131 extensions_browser_client_.reset(
135 new ShellExtensionsBrowserClient(browser_context_.get())); 132 new ShellExtensionsBrowserClient(browser_context_.get()));
136 ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 133 ExtensionsBrowserClient::Set(extensions_browser_client_.get());
137 134
138 omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate); 135 omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
139 omaha_query_params::OmahaQueryParams::SetDelegate( 136 omaha_query_params::OmahaQueryParams::SetDelegate(
140 omaha_query_params_delegate_.get()); 137 omaha_query_params_delegate_.get());
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 209 }
213 210
214 void ShellBrowserMainParts::CreateExtensionSystem() { 211 void ShellBrowserMainParts::CreateExtensionSystem() {
215 DCHECK(browser_context_); 212 DCHECK(browser_context_);
216 extension_system_ = static_cast<ShellExtensionSystem*>( 213 extension_system_ = static_cast<ShellExtensionSystem*>(
217 ExtensionSystem::Get(browser_context_.get())); 214 ExtensionSystem::Get(browser_context_.get()));
218 extension_system_->InitForRegularProfile(true); 215 extension_system_->InitForRegularProfile(true);
219 } 216 }
220 217
221 } // namespace extensions 218 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_browser_main_delegate.h ('k') | extensions/shell/browser/shell_desktop_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698