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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_content_main.h" 5 #include "content/public/app/content_main.h"
6 #include "wm/shell/content_client/shell_main_delegate.h"
6 7
7 #include "content/public/app/content_main.h" 8 int main(int argc, const char** argv) {
8 #include "content/shell/shell_main_delegate.h" 9 wm::shell::ShellMainDelegate delegate;
9
10 #if defined(OS_MACOSX)
11 int ContentMain(int argc,
12 const char** argv) {
13 content::ShellMainDelegate delegate;
14 return content::ContentMain(argc, argv, &delegate); 10 return content::ContentMain(argc, argv, &delegate);
15 } 11 }
16 #endif // OS_MACOSX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698