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

Unified Diff: wm/shell/shell_main.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/shell_main.cc
diff --git a/content/shell/shell_content_main.cc b/wm/shell/shell_main.cc
similarity index 53%
copy from content/shell/shell_content_main.cc
copy to wm/shell/shell_main.cc
index 79931987f4bd4bac68ee22dbac28608a21303d02..0ea967a73b574a62590c20b1de751d82a9125113 100644
--- a/content/shell/shell_content_main.cc
+++ b/wm/shell/shell_main.cc
@@ -2,15 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/shell/shell_content_main.h"
-
#include "content/public/app/content_main.h"
-#include "content/shell/shell_main_delegate.h"
+#include "wm/shell/content_client/shell_main_delegate.h"
-#if defined(OS_MACOSX)
-int ContentMain(int argc,
- const char** argv) {
- content::ShellMainDelegate delegate;
+int main(int argc, const char** argv) {
+ wm::shell::ShellMainDelegate delegate;
return content::ContentMain(argc, argv, &delegate);
}
-#endif // OS_MACOSX

Powered by Google App Engine
This is Rietveld 408576698