OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/main/athena_main_delegate.h" | 5 #include "extensions/shell/app/shell_main_mac.h" |
6 | |
6 #include "content/public/app/content_main.h" | 7 #include "content/public/app/content_main.h" |
8 #include "extensions/shell/app/shell_main_delegate.h" | |
7 | 9 |
8 int main(int argc, const char** argv) { | 10 #if defined(OS_MACOSX) |
9 athena::AthenaMainDelegate delegate; | 11 int ContentMain(int argc, const char** argv) { |
12 extensions::ShellMainDelegate delegate; | |
James Cook
2014/12/10 21:05:00
ugh, this seems like the worst of both worlds -- i
Yoyo Zhou
2014/12/11 02:40:50
This is the way content_shell does it. It's little
| |
10 content::ContentMainParams params(&delegate); | 13 content::ContentMainParams params(&delegate); |
11 | |
12 params.argc = argc; | 14 params.argc = argc; |
13 params.argv = argv; | 15 params.argv = argv; |
14 | |
15 return content::ContentMain(params); | 16 return content::ContentMain(params); |
16 } | 17 } |
18 #endif // OS_MACOSX | |
OLD | NEW |