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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 2627713007: Move v8_breakpad_support_win from common to child (Closed)
Patch Set: . Created 3 years, 11 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 | « no previous file | chrome/child/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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "ui/base/material_design/material_design_controller.h" 57 #include "ui/base/material_design/material_design_controller.h"
58 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
59 #include "ui/base/ui_base_switches.h" 59 #include "ui/base/ui_base_switches.h"
60 60
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 #include <atlbase.h> 62 #include <atlbase.h>
63 #include <malloc.h> 63 #include <malloc.h>
64 #include <algorithm> 64 #include <algorithm>
65 #include "base/debug/close_handle_hook_win.h" 65 #include "base/debug/close_handle_hook_win.h"
66 #include "chrome/browser/downgrade/user_data_downgrade.h" 66 #include "chrome/browser/downgrade/user_data_downgrade.h"
67 #include "chrome/child/v8_breakpad_support_win.h"
67 #include "chrome/common/child_process_logging.h" 68 #include "chrome/common/child_process_logging.h"
68 #include "chrome/common/v8_breakpad_support_win.h"
69 #include "components/crash/content/app/crashpad.h" 69 #include "components/crash/content/app/crashpad.h"
70 #include "sandbox/win/src/sandbox.h" 70 #include "sandbox/win/src/sandbox.h"
71 #include "ui/base/resource/resource_bundle_win.h" 71 #include "ui/base/resource/resource_bundle_win.h"
72 #endif 72 #endif
73 73
74 #if defined(OS_MACOSX) 74 #if defined(OS_MACOSX)
75 #include "base/mac/foundation_util.h" 75 #include "base/mac/foundation_util.h"
76 #include "chrome/app/chrome_main_mac.h" 76 #include "chrome/app/chrome_main_mac.h"
77 #include "chrome/browser/mac/relauncher.h" 77 #include "chrome/browser/mac/relauncher.h"
78 #include "chrome/browser/shell_integration.h" 78 #include "chrome/browser/shell_integration.h"
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 526
527 SetUpBundleOverrides(); 527 SetUpBundleOverrides();
528 chrome::common::mac::EnableCFBundleBlocker(); 528 chrome::common::mac::EnableCFBundleBlocker();
529 #endif 529 #endif
530 530
531 Profiling::ProcessStarted(); 531 Profiling::ProcessStarted();
532 532
533 base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate( 533 base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
534 base::Bind(&IsTraceEventArgsWhitelisted)); 534 base::Bind(&IsTraceEventArgsWhitelisted));
535 535
536 #if defined(OS_WIN) 536 #if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
537 v8_breakpad_support::SetUp(); 537 v8_breakpad_support::SetUp();
538 #endif 538 #endif
539 539
540 #if defined(OS_POSIX) 540 #if defined(OS_POSIX)
541 if (HandleVersionSwitches(command_line)) { 541 if (HandleVersionSwitches(command_line)) {
542 *exit_code = 0; 542 *exit_code = 0;
543 return true; // Got a --version switch; exit with a success error code. 543 return true; // Got a --version switch; exit with a success error code.
544 } 544 }
545 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 545 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
546 // This will directly exit if the user asked for help. 546 // This will directly exit if the user asked for help.
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 case version_info::Channel::CANARY: 1078 case version_info::Channel::CANARY:
1079 return true; 1079 return true;
1080 case version_info::Channel::DEV: 1080 case version_info::Channel::DEV:
1081 case version_info::Channel::BETA: 1081 case version_info::Channel::BETA:
1082 case version_info::Channel::STABLE: 1082 case version_info::Channel::STABLE:
1083 default: 1083 default:
1084 // Don't enable instrumentation. 1084 // Don't enable instrumentation.
1085 return false; 1085 return false;
1086 } 1086 }
1087 } 1087 }
OLDNEW
« no previous file with comments | « no previous file | chrome/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698