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

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

Issue 1988733002: Revert "Enable MD by default on Windows for Canary/Dev and local builds." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/browser/chrome_browser_main.cc » ('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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 // Must do this before any other usage of command line! 512 // Must do this before any other usage of command line!
513 if (HasDeprecatedArguments(command_line.GetCommandLineString())) { 513 if (HasDeprecatedArguments(command_line.GetCommandLineString())) {
514 *exit_code = 1; 514 *exit_code = 1;
515 return true; 515 return true;
516 } 516 }
517 517
518 if (UseHooks()) 518 if (UseHooks())
519 base::debug::InstallHandleHooks(); 519 base::debug::InstallHandleHooks();
520 else 520 else
521 base::win::DisableHandleVerifier(); 521 base::win::DisableHandleVerifier();
522
522 #endif 523 #endif
523 524
524 chrome::RegisterPathProvider(); 525 chrome::RegisterPathProvider();
525 #if defined(OS_CHROMEOS) 526 #if defined(OS_CHROMEOS)
526 chromeos::RegisterPathProvider(); 527 chromeos::RegisterPathProvider();
527 #endif 528 #endif
528 #if !defined(DISABLE_NACL) && defined(OS_LINUX) 529 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
529 nacl::RegisterPathProvider(); 530 nacl::RegisterPathProvider();
530 #endif 531 #endif
531 532
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 case version_info::Channel::CANARY: 1020 case version_info::Channel::CANARY:
1020 return true; 1021 return true;
1021 case version_info::Channel::DEV: 1022 case version_info::Channel::DEV:
1022 case version_info::Channel::BETA: 1023 case version_info::Channel::BETA:
1023 case version_info::Channel::STABLE: 1024 case version_info::Channel::STABLE:
1024 default: 1025 default:
1025 // Don't enable instrumentation. 1026 // Don't enable instrumentation.
1026 return false; 1027 return false;
1027 } 1028 }
1028 } 1029 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698