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

Side by Side Diff: ash/shell/content/shell_with_content_main.cc

Issue 1387963006: Adding error handlers to setup.exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix lint errors/warnings Created 5 years, 2 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
« no previous file with comments | « ash/ash.gyp ('k') | base/BUILD.gn » ('j') | 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) 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 "ash/shell/content/client/shell_main_delegate.h" 5 #include "ash/shell/content/client/shell_main_delegate.h"
6 #include "base/at_exit.h" 6 #include "base/at_exit.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/app/content_main.h" 10 #include "content/public/app/content_main.h"
11 11
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "content/public/app/startup_helper_win.h" 13 #include "content/public/app/sandbox_helper_win.h"
14 #include "sandbox/win/src/sandbox_types.h" 14 #include "sandbox/win/src/sandbox_types.h"
15 #endif 15 #endif
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { 18 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
19 int argc = 0; 19 int argc = 0;
20 char** argv = nullptr; 20 char** argv = nullptr;
21 #else 21 #else
22 int main(int argc, const char** argv) { 22 int main(int argc, const char** argv) {
23 #endif 23 #endif
(...skipping 17 matching lines...) Expand all
41 content::InitializeSandboxInfo(&sandbox_info); 41 content::InitializeSandboxInfo(&sandbox_info);
42 params.instance = instance; 42 params.instance = instance;
43 params.sandbox_info = &sandbox_info; 43 params.sandbox_info = &sandbox_info;
44 #else 44 #else
45 params.argc = argc; 45 params.argc = argc;
46 params.argv = argv; 46 params.argv = argv;
47 #endif 47 #endif
48 48
49 return content::ContentMain(params); 49 return content::ContentMain(params);
50 } 50 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698