| OLD | NEW |
| 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" |
| 17 #include "components/omaha_query_params/omaha_query_params.h" |
| 16 #include "content/public/common/result_codes.h" | 18 #include "content/public/common/result_codes.h" |
| 17 #include "content/shell/browser/shell_devtools_delegate.h" | 19 #include "content/shell/browser/shell_devtools_delegate.h" |
| 18 #include "content/shell/browser/shell_net_log.h" | 20 #include "content/shell/browser/shell_net_log.h" |
| 19 #include "extensions/browser/browser_context_keyed_service_factories.h" | 21 #include "extensions/browser/browser_context_keyed_service_factories.h" |
| 20 #include "extensions/browser/extension_system.h" | 22 #include "extensions/browser/extension_system.h" |
| 21 #include "ui/aura/window_tree_host.h" | 23 #include "ui/aura/window_tree_host.h" |
| 22 #include "ui/base/ime/input_method_initializer.h" | 24 #include "ui/base/ime/input_method_initializer.h" |
| 23 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
| 24 | 26 |
| 25 #if defined(OS_CHROMEOS) | 27 #if defined(OS_CHROMEOS) |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 // TODO(jamescook): Initialize chromeos::UserManager. | 94 // TODO(jamescook): Initialize chromeos::UserManager. |
| 93 net_log_.reset(new content::ShellNetLog("app_shell")); | 95 net_log_.reset(new content::ShellNetLog("app_shell")); |
| 94 | 96 |
| 95 extensions_client_.reset(new ShellExtensionsClient()); | 97 extensions_client_.reset(new ShellExtensionsClient()); |
| 96 extensions::ExtensionsClient::Set(extensions_client_.get()); | 98 extensions::ExtensionsClient::Set(extensions_client_.get()); |
| 97 | 99 |
| 98 extensions_browser_client_.reset( | 100 extensions_browser_client_.reset( |
| 99 new extensions::ShellExtensionsBrowserClient(browser_context_.get())); | 101 new extensions::ShellExtensionsBrowserClient(browser_context_.get())); |
| 100 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); | 102 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); |
| 101 | 103 |
| 104 omaha_query_params_delegate_.reset( |
| 105 new extensions::ShellOmahaQueryParamsDelegate); |
| 106 omaha_query_params::OmahaQueryParams::SetDelegate( |
| 107 omaha_query_params_delegate_.get()); |
| 108 |
| 102 // Create our custom ExtensionSystem first because other | 109 // Create our custom ExtensionSystem first because other |
| 103 // KeyedServices depend on it. | 110 // KeyedServices depend on it. |
| 104 // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt. | 111 // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt. |
| 105 CreateExtensionSystem(); | 112 CreateExtensionSystem(); |
| 106 | 113 |
| 107 ::EnsureBrowserContextKeyedServiceFactoriesBuilt(); | 114 ::EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 108 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( | 115 BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( |
| 109 browser_context_.get()); | 116 browser_context_.get()); |
| 110 | 117 |
| 111 devtools_delegate_.reset( | 118 devtools_delegate_.reset( |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 } | 158 } |
| 152 | 159 |
| 153 void ShellBrowserMainParts::CreateExtensionSystem() { | 160 void ShellBrowserMainParts::CreateExtensionSystem() { |
| 154 DCHECK(browser_context_); | 161 DCHECK(browser_context_); |
| 155 extension_system_ = static_cast<ShellExtensionSystem*>( | 162 extension_system_ = static_cast<ShellExtensionSystem*>( |
| 156 ExtensionSystem::Get(browser_context_.get())); | 163 ExtensionSystem::Get(browser_context_.get())); |
| 157 extension_system_->InitForRegularProfile(true); | 164 extension_system_->InitForRegularProfile(true); |
| 158 } | 165 } |
| 159 | 166 |
| 160 } // namespace apps | 167 } // namespace apps |
| OLD | NEW |