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

Side by Side Diff: content/shell/shell_content_main.cc

Issue 10809016: Move content_shell and content_browsertests code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android Created 8 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 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/shell/shell_content_main.h"
6 6
7 #include "content/public/app/content_main.h" 7 #include "content/public/app/content_main.h"
8 #include "content/shell/shell_main_delegate.h" 8 #include "content/shell/shell_main_delegate.h"
9 9
10 #if defined(OS_MACOSX) 10 #if defined(OS_MACOSX)
11 int ContentMain(int argc, 11 int ContentMain(int argc,
12 const char** argv) { 12 const char** argv) {
13 ShellMainDelegate delegate; 13 content::ShellMainDelegate delegate;
14 return content::ContentMain(argc, argv, &delegate); 14 return content::ContentMain(argc, argv, &delegate);
15 } 15 }
16 #endif // OS_MACOSX 16 #endif // OS_MACOSX
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.cc ('k') | content/shell/shell_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698