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

Unified Diff: extensions/shell/browser/default_shell_browser_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
Index: extensions/shell/browser/default_shell_browser_main_delegate.cc
diff --git a/apps/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc
similarity index 72%
rename from apps/shell/browser/default_shell_browser_main_delegate.cc
rename to extensions/shell/browser/default_shell_browser_main_delegate.cc
index df2ff4d756b5aff7b5ba5330e6308056e4cc3ce3..5fb2cf101607b49f735ae466e595108fea1f726b 100644
--- a/apps/shell/browser/default_shell_browser_main_delegate.cc
+++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/shell/browser/default_shell_browser_main_delegate.h"
+#include "extensions/shell/browser/default_shell_browser_main_delegate.h"
-#include "apps/shell/browser/default_shell_app_window_controller.h"
-#include "apps/shell/browser/shell_desktop_controller.h"
-#include "apps/shell/browser/shell_extension_system.h"
-#include "apps/shell/common/switches.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "extensions/shell/browser/default_shell_app_window_controller.h"
+#include "extensions/shell/browser/shell_desktop_controller.h"
+#include "extensions/shell/browser/shell_extension_system.h"
+#include "extensions/shell/common/switches.h"
-namespace apps {
+namespace extensions {
DefaultShellBrowserMainDelegate::DefaultShellBrowserMainDelegate() {
}
@@ -28,9 +28,8 @@ void DefaultShellBrowserMainDelegate::Start(
command_line->GetSwitchValueNative(switches::kAppShellAppPath));
base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
- extensions::ShellExtensionSystem* extension_system =
- static_cast<extensions::ShellExtensionSystem*>(
- extensions::ExtensionSystem::Get(browser_context));
+ ShellExtensionSystem* extension_system = static_cast<ShellExtensionSystem*>(
+ ExtensionSystem::Get(browser_context));
if (!extension_system->LoadApp(app_absolute_dir))
return;
extension_system->LaunchApp();
@@ -50,4 +49,4 @@ DefaultShellBrowserMainDelegate::CreateDesktopController() {
return desktop;
}
-} // namespace apps
+} // namespace extensions
« no previous file with comments | « extensions/shell/browser/default_shell_browser_main_delegate.h ('k') | extensions/shell/browser/dns_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698