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

Unified Diff: extensions/shell/app/shell_main_mac.cc

Issue 745093002: AppShell support for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minors Created 6 years 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
« no previous file with comments | « extensions/shell/app/shell_main_mac.h ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 64%
copy from athena/main/athena_main.cc
copy to extensions/shell/app/shell_main_mac.cc
index 1eab12834d91880bac0f081dee247302f3165e10..85195c5a3426512c41c9e43eb010d687c5a1c85c 100644
--- a/athena/main/athena_main.cc
+++ b/extensions/shell/app/shell_main_mac.cc
@@ -2,15 +2,15 @@
// 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;
+int ContentMain(int argc, const char** argv) {
+ extensions::ShellMainDelegate delegate;
content::ContentMainParams params(&delegate);
-
params.argc = argc;
params.argv = argv;
-
return content::ContentMain(params);
}
« no previous file with comments | « extensions/shell/app/shell_main_mac.h ('k') | extensions/shell/app_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698