| Index: extensions/shell/browser/shell_browser_main_parts.cc
|
| diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
|
| similarity index 80%
|
| rename from apps/shell/browser/shell_browser_main_parts.cc
|
| rename to extensions/shell/browser/shell_browser_main_parts.cc
|
| index bafbf8e8950a0ea60dcd32159582eb00575bb041..390771e8169d89fa482d08bac71035362d3078cd 100644
|
| --- a/apps/shell/browser/shell_browser_main_parts.cc
|
| +++ b/extensions/shell/browser/shell_browser_main_parts.cc
|
| @@ -2,17 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "apps/shell/browser/shell_browser_main_parts.h"
|
| -
|
| -#include "apps/shell/browser/shell_browser_context.h"
|
| -#include "apps/shell/browser/shell_browser_main_delegate.h"
|
| -#include "apps/shell/browser/shell_desktop_controller.h"
|
| -#include "apps/shell/browser/shell_extension_system.h"
|
| -#include "apps/shell/browser/shell_extension_system_factory.h"
|
| -#include "apps/shell/browser/shell_extensions_browser_client.h"
|
| -#include "apps/shell/browser/shell_omaha_query_params_delegate.h"
|
| -#include "apps/shell/common/shell_extensions_client.h"
|
| -#include "apps/shell/common/switches.h"
|
| +#include "extensions/shell/browser/shell_browser_main_parts.h"
|
| +
|
| #include "base/command_line.h"
|
| #include "base/run_loop.h"
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| @@ -22,19 +13,25 @@
|
| #include "content/shell/browser/shell_net_log.h"
|
| #include "extensions/browser/browser_context_keyed_service_factories.h"
|
| #include "extensions/browser/extension_system.h"
|
| +#include "extensions/shell/browser/shell_browser_context.h"
|
| +#include "extensions/shell/browser/shell_browser_main_delegate.h"
|
| +#include "extensions/shell/browser/shell_desktop_controller.h"
|
| +#include "extensions/shell/browser/shell_extension_system.h"
|
| +#include "extensions/shell/browser/shell_extension_system_factory.h"
|
| +#include "extensions/shell/browser/shell_extensions_browser_client.h"
|
| +#include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
|
| +#include "extensions/shell/common/shell_extensions_client.h"
|
| +#include "extensions/shell/common/switches.h"
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "apps/shell/browser/shell_network_controller_chromeos.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| +#include "extensions/shell/browser/shell_network_controller_chromeos.h"
|
| #endif
|
|
|
| using content::BrowserContext;
|
| -using extensions::Extension;
|
| -using extensions::ExtensionSystem;
|
| -using extensions::ShellExtensionSystem;
|
|
|
| namespace {
|
|
|
| @@ -47,7 +44,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
|
|
|
| } // namespace
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
|
|
| ShellBrowserMainParts::ShellBrowserMainParts(
|
| const content::MainFunctionParams& parameters,
|
| @@ -99,14 +96,13 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
| net_log_.reset(new content::ShellNetLog("app_shell"));
|
|
|
| extensions_client_.reset(new ShellExtensionsClient());
|
| - extensions::ExtensionsClient::Set(extensions_client_.get());
|
| + ExtensionsClient::Set(extensions_client_.get());
|
|
|
| extensions_browser_client_.reset(
|
| - new extensions::ShellExtensionsBrowserClient(browser_context_.get()));
|
| - extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
|
| + new ShellExtensionsBrowserClient(browser_context_.get()));
|
| + ExtensionsBrowserClient::Set(extensions_browser_client_.get());
|
|
|
| - omaha_query_params_delegate_.reset(
|
| - new extensions::ShellOmahaQueryParamsDelegate);
|
| + omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
|
| omaha_query_params::OmahaQueryParams::SetDelegate(
|
| omaha_query_params_delegate_.get());
|
|
|
| @@ -131,7 +127,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
| }
|
| }
|
|
|
| -bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
|
| +bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
|
| if (!run_message_loop_)
|
| return true;
|
| // TODO(yoz): just return false here?
|
| @@ -147,7 +143,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
|
| BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
|
| browser_context_.get());
|
| extension_system_ = NULL;
|
| - extensions::ExtensionsBrowserClient::Set(NULL);
|
| + ExtensionsBrowserClient::Set(NULL);
|
| extensions_browser_client_.reset();
|
| browser_context_.reset();
|
|
|
| @@ -168,4 +164,4 @@ void ShellBrowserMainParts::CreateExtensionSystem() {
|
| extension_system_->InitForRegularProfile(true);
|
| }
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|