Chromium Code Reviews| Index: extensions/shell/app/shell_main_mac.cc |
| diff --git a/athena/main/athena_main.cc b/extensions/shell/app/shell_main_mac.cc |
| similarity index 59% |
| copy from athena/main/athena_main.cc |
| copy to extensions/shell/app/shell_main_mac.cc |
| index 1eab12834d91880bac0f081dee247302f3165e10..9416f4f65b495422cb3fd5843159638be1c597d1 100644 |
| --- a/athena/main/athena_main.cc |
| +++ b/extensions/shell/app/shell_main_mac.cc |
| @@ -2,15 +2,17 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "athena/main/athena_main_delegate.h" |
| +#include "extensions/shell/app/shell_main_mac.h" |
| + |
| #include "content/public/app/content_main.h" |
| +#include "extensions/shell/app/shell_main_delegate.h" |
| -int main(int argc, const char** argv) { |
| - athena::AthenaMainDelegate delegate; |
| +#if defined(OS_MACOSX) |
|
tapted
2014/12/17 08:05:15
nit: are these #ifdefs needed? (same comment for t
Yoyo Zhou
2014/12/18 02:38:33
No.
|
| +int ContentMain(int argc, const char** argv) { |
| + extensions::ShellMainDelegate delegate; |
| content::ContentMainParams params(&delegate); |
| - |
| params.argc = argc; |
| params.argv = argv; |
| - |
| return content::ContentMain(params); |
| } |
| +#endif // OS_MACOSX |