| OLD | NEW |
| 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 } else { // Not running diagnostics or recovery. | 629 } else { // Not running diagnostics or recovery. |
| 630 diagnostics::DiagnosticsController::GetInstance()->RecordRegularStartup(); | 630 diagnostics::DiagnosticsController::GetInstance()->RecordRegularStartup(); |
| 631 } | 631 } |
| 632 #endif | 632 #endif |
| 633 | 633 |
| 634 if (command_line.HasSwitch(switches::kOriginTrialPublicKey)) { | 634 if (command_line.HasSwitch(switches::kOriginTrialPublicKey)) { |
| 635 chrome_content_client_.origin_trial_key_manager() | 635 chrome_content_client_.origin_trial_key_manager() |
| 636 ->SetPublicKeyFromASCIIString( | 636 ->SetPublicKeyFromASCIIString( |
| 637 command_line.GetSwitchValueASCII(switches::kOriginTrialPublicKey)); | 637 command_line.GetSwitchValueASCII(switches::kOriginTrialPublicKey)); |
| 638 } | 638 } |
| 639 if (command_line.HasSwitch(switches::kOriginTrialDisabledFeatures)) { |
| 640 chrome_content_client_.origin_trial_key_manager()->SetDisabledFeatures( |
| 641 command_line.GetSwitchValueASCII( |
| 642 switches::kOriginTrialDisabledFeatures)); |
| 643 } |
| 639 | 644 |
| 640 content::SetContentClient(&chrome_content_client_); | 645 content::SetContentClient(&chrome_content_client_); |
| 641 | 646 |
| 642 return false; | 647 return false; |
| 643 } | 648 } |
| 644 | 649 |
| 645 #if defined(OS_MACOSX) | 650 #if defined(OS_MACOSX) |
| 646 void ChromeMainDelegate::InitMacCrashReporter( | 651 void ChromeMainDelegate::InitMacCrashReporter( |
| 647 const base::CommandLine& command_line, | 652 const base::CommandLine& command_line, |
| 648 const std::string& process_type) { | 653 const std::string& process_type) { |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1020 case version_info::Channel::CANARY: | 1025 case version_info::Channel::CANARY: |
| 1021 return true; | 1026 return true; |
| 1022 case version_info::Channel::DEV: | 1027 case version_info::Channel::DEV: |
| 1023 case version_info::Channel::BETA: | 1028 case version_info::Channel::BETA: |
| 1024 case version_info::Channel::STABLE: | 1029 case version_info::Channel::STABLE: |
| 1025 default: | 1030 default: |
| 1026 // Don't enable instrumentation. | 1031 // Don't enable instrumentation. |
| 1027 return false; | 1032 return false; |
| 1028 } | 1033 } |
| 1029 } | 1034 } |
| OLD | NEW |