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

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

Issue 333353005: Move OmahaQueryParams to a component and add a delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
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/common/shell_extensions_client.h" 14 #include "apps/shell/common/shell_extensions_client.h"
14 #include "base/run_loop.h" 15 #include "base/run_loop.h"
15 #include "components/keyed_service/content/browser_context_dependency_manager.h" 16 #include "components/keyed_service/content/browser_context_dependency_manager.h"
16 #include "content/public/common/result_codes.h" 17 #include "content/public/common/result_codes.h"
17 #include "content/shell/browser/shell_devtools_delegate.h" 18 #include "content/shell/browser/shell_devtools_delegate.h"
18 #include "content/shell/browser/shell_net_log.h" 19 #include "content/shell/browser/shell_net_log.h"
19 #include "extensions/browser/browser_context_keyed_service_factories.h" 20 #include "extensions/browser/browser_context_keyed_service_factories.h"
20 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_system.h"
21 #include "ui/aura/window_tree_host.h" 22 #include "ui/aura/window_tree_host.h"
22 #include "ui/base/ime/input_method_initializer.h" 23 #include "ui/base/ime/input_method_initializer.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // TODO(jamescook): Initialize chromeos::UserManager. 93 // TODO(jamescook): Initialize chromeos::UserManager.
93 net_log_.reset(new content::ShellNetLog("app_shell")); 94 net_log_.reset(new content::ShellNetLog("app_shell"));
94 95
95 extensions_client_.reset(new ShellExtensionsClient()); 96 extensions_client_.reset(new ShellExtensionsClient());
96 extensions::ExtensionsClient::Set(extensions_client_.get()); 97 extensions::ExtensionsClient::Set(extensions_client_.get());
97 98
98 extensions_browser_client_.reset( 99 extensions_browser_client_.reset(
99 new extensions::ShellExtensionsBrowserClient(browser_context_.get())); 100 new extensions::ShellExtensionsBrowserClient(browser_context_.get()));
100 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); 101 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
101 102
103 omaha_query_params_delegate_.reset(
104 new extensions::ShellOmahaQueryParamsDelegate);
105 OmahaQueryParamsDelegate::Set(omaha_query_params_delegate_.get());
106
102 // Create our custom ExtensionSystem first because other 107 // Create our custom ExtensionSystem first because other
103 // KeyedServices depend on it. 108 // KeyedServices depend on it.
104 // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt. 109 // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
105 CreateExtensionSystem(); 110 CreateExtensionSystem();
106 111
107 ::EnsureBrowserContextKeyedServiceFactoriesBuilt(); 112 ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
108 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( 113 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
109 browser_context_.get()); 114 browser_context_.get());
110 115
111 devtools_delegate_.reset( 116 devtools_delegate_.reset(
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 156 }
152 157
153 void ShellBrowserMainParts::CreateExtensionSystem() { 158 void ShellBrowserMainParts::CreateExtensionSystem() {
154 DCHECK(browser_context_); 159 DCHECK(browser_context_);
155 extension_system_ = static_cast<ShellExtensionSystem*>( 160 extension_system_ = static_cast<ShellExtensionSystem*>(
156 ExtensionSystem::Get(browser_context_.get())); 161 ExtensionSystem::Get(browser_context_.get()));
157 extension_system_->InitForRegularProfile(true); 162 extension_system_->InitForRegularProfile(true);
158 } 163 }
159 164
160 } // namespace apps 165 } // namespace apps
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698