| Index: extensions/shell/app/shell_main_delegate.cc
|
| diff --git a/apps/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc
|
| similarity index 82%
|
| rename from apps/shell/app/shell_main_delegate.cc
|
| rename to extensions/shell/app/shell_main_delegate.cc
|
| index 2e98a1df032efb25412f1eaa85cd2b0819278b51..19b0ea56955530abb98a7bec950bda77aeeb51db 100644
|
| --- a/apps/shell/app/shell_main_delegate.cc
|
| +++ b/extensions/shell/app/shell_main_delegate.cc
|
| @@ -2,13 +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/app/shell_main_delegate.h"
|
| +#include "extensions/shell/app/shell_main_delegate.h"
|
|
|
| -#include "apps/shell/browser/default_shell_browser_main_delegate.h"
|
| -#include "apps/shell/browser/shell_content_browser_client.h"
|
| -#include "apps/shell/common/shell_content_client.h"
|
| -#include "apps/shell/renderer/shell_content_renderer_client.h"
|
| -#include "apps/shell/renderer/shell_renderer_main_delegate.h"
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| @@ -16,6 +11,11 @@
|
| #include "content/public/browser/browser_main_runner.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "extensions/common/extension_paths.h"
|
| +#include "extensions/shell/browser/default_shell_browser_main_delegate.h"
|
| +#include "extensions/shell/browser/shell_content_browser_client.h"
|
| +#include "extensions/shell/common/shell_content_client.h"
|
| +#include "extensions/shell/renderer/shell_content_renderer_client.h"
|
| +#include "extensions/shell/renderer/shell_renderer_main_delegate.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -38,7 +38,7 @@ void InitLogging() {
|
|
|
| } // namespace
|
|
|
| -namespace apps {
|
| +namespace extensions {
|
|
|
| ShellMainDelegate::ShellMainDelegate() {
|
| }
|
| @@ -73,8 +73,7 @@ content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
|
|
|
| content::ContentBrowserClient*
|
| ShellMainDelegate::CreateShellContentBrowserClient() {
|
| - return new apps::ShellContentBrowserClient(
|
| - new DefaultShellBrowserMainDelegate());
|
| + return new ShellContentBrowserClient(new DefaultShellBrowserMainDelegate());
|
| }
|
|
|
| content::ContentRendererClient*
|
| @@ -101,10 +100,9 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
|
| const std::string& process_type) {
|
| // The browser process has no process type flag, but needs resources.
|
| // On Linux the zygote process opens the resources for the renderers.
|
| - return process_type.empty() ||
|
| - process_type == switches::kZygoteProcess ||
|
| + return process_type.empty() || process_type == switches::kZygoteProcess ||
|
| process_type == switches::kRendererProcess ||
|
| process_type == switches::kUtilityProcess;
|
| }
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|