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

Unified Diff: extensions/shell/app/shell_main_delegate.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/app/shell_main_delegate.h ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85%
rename from apps/shell/app/shell_main_delegate.cc
rename to extensions/shell/app/shell_main_delegate.cc
index 2e98a1df032efb25412f1eaa85cd2b0819278b51..e165441ae38b7dfd228bcc2286f9f9830cd613ae 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*
@@ -107,4 +106,4 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
process_type == switches::kUtilityProcess;
}
-} // namespace apps
+} // namespace extensions
« no previous file with comments | « extensions/shell/app/shell_main_delegate.h ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698