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

Side by Side Diff: apps/shell/shell_main.cc

Issue 149463002: [App Shell] Port app_shell to windows aura.(not use) (Closed) Base URL: https://github.com/mirrors/chromium.git@master
Patch Set: Created 6 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
« apps/DEPS ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "apps/shell/shell_main_delegate.h" 5 #include "apps/shell/shell_main_delegate.h"
6 #include "content/public/app/content_main.h" 6 #include "content/public/app/content_main.h"
7 #include "sandbox/win/src/sandbox_types.h"
James Cook 2014/01/29 20:42:00 should this go inside the ifdef below?
Haojian Wu 2014/01/30 06:28:47 Yes. Done.
8
9 #if defined(OS_WIN)
10 #include "content/public/app/startup_helper_win.h"
11 #endif
12
13 #if defined(OS_WIN)
14
15 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
16 sandbox::SandboxInterfaceInfo sandbox_info = {0};
17 content::InitializeSandboxInfo(&sandbox_info);
18 apps::ShellMainDelegate delegate;
19 return content::ContentMain(instance, &sandbox_info, &delegate);
20 }
21
22 #else
7 23
8 int main(int argc, const char** argv) { 24 int main(int argc, const char** argv) {
9 apps::ShellMainDelegate delegate; 25 apps::ShellMainDelegate delegate;
10 return content::ContentMain(argc, argv, &delegate); 26 return content::ContentMain(argc, argv, &delegate);
11 } 27 }
28
29 #endif
James Cook 2014/01/29 20:42:00 optional nit: consider // defined(OS_WIN) since th
Haojian Wu 2014/01/30 06:28:47 Done.
OLDNEW
« apps/DEPS ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698