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

Unified Diff: wm/shell/content_client/shell_main_delegate.cc

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add proper use_wm flag support Created 7 years, 10 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: wm/shell/content_client/shell_main_delegate.cc
diff --git a/ash/shell/content_client/shell_main_delegate.cc b/wm/shell/content_client/shell_main_delegate.cc
similarity index 81%
copy from ash/shell/content_client/shell_main_delegate.cc
copy to wm/shell/content_client/shell_main_delegate.cc
index 343ba27f04cbfb74ff694f93d71e3dee0527053c..a5868ed05066cffee00087682c5d58c50bb75225 100644
--- a/ash/shell/content_client/shell_main_delegate.cc
+++ b/wm/shell/content_client/shell_main_delegate.cc
@@ -2,17 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shell/content_client/shell_main_delegate.h"
+#include "wm/shell/content_client/shell_main_delegate.h"
+
+#include <string>
-#include "ash/shell/content_client/shell_content_browser_client.h"
#include "base/command_line.h"
-#include "base/file_path.h"
-#include "base/path_service.h"
#include "content/public/common/content_switches.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
+#include "wm/shell/content_client/shell_content_browser_client.h"
-namespace ash {
+namespace wm {
namespace shell {
ShellMainDelegate::ShellMainDelegate() {
@@ -45,4 +44,4 @@ void ShellMainDelegate::InitializeResourceBundle() {
}
} // namespace shell
-} // namespace ash
+} // namespace wm

Powered by Google App Engine
This is Rietveld 408576698