| 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/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | |
| 10 #include <set> | 9 #include <set> |
| 11 #include <string> | 10 #include <string> |
| 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/at_exit.h" | 14 #include "base/at_exit.h" |
| 15 #include "base/base_switches.h" | 15 #include "base/base_switches.h" |
| 16 #include "base/bind.h" | 16 #include "base/bind.h" |
| 17 #include "base/command_line.h" | 17 #include "base/command_line.h" |
| 18 #include "base/debug/crash_logging.h" | 18 #include "base/debug/crash_logging.h" |
| 19 #include "base/debug/debugger.h" | 19 #include "base/debug/debugger.h" |
| 20 #include "base/feature_list.h" | 20 #include "base/feature_list.h" |
| 21 #include "base/files/file_path.h" | 21 #include "base/files/file_path.h" |
| (...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 !command_line->HasSwitch(variations::switches::kVariationsServerURL)) { | 714 !command_line->HasSwitch(variations::switches::kVariationsServerURL)) { |
| 715 chrome_variations::AssociateDefaultFieldTrialConfig(feature_list.get()); | 715 chrome_variations::AssociateDefaultFieldTrialConfig(feature_list.get()); |
| 716 } | 716 } |
| 717 #endif // defined(FIELDTRIAL_TESTING_ENABLED) | 717 #endif // defined(FIELDTRIAL_TESTING_ENABLED) |
| 718 | 718 |
| 719 variations::VariationsService* variations_service = | 719 variations::VariationsService* variations_service = |
| 720 browser_process_->variations_service(); | 720 browser_process_->variations_service(); |
| 721 if (variations_service) | 721 if (variations_service) |
| 722 variations_service->CreateTrialsFromSeed(feature_list.get()); | 722 variations_service->CreateTrialsFromSeed(feature_list.get()); |
| 723 | 723 |
| 724 base::FeatureList::SetInstance(feature_list.Pass()); | 724 base::FeatureList::SetInstance(std::move(feature_list)); |
| 725 | 725 |
| 726 // This must be called after |local_state_| is initialized. | 726 // This must be called after |local_state_| is initialized. |
| 727 browser_field_trials_.SetupFieldTrials(); | 727 browser_field_trials_.SetupFieldTrials(); |
| 728 | 728 |
| 729 // Enable Navigation Tracing only if a trace upload url is specified. | 729 // Enable Navigation Tracing only if a trace upload url is specified. |
| 730 if (command_line->HasSwitch(switches::kEnableNavigationTracing) && | 730 if (command_line->HasSwitch(switches::kEnableNavigationTracing) && |
| 731 command_line->HasSwitch(switches::kTraceUploadURL)) { | 731 command_line->HasSwitch(switches::kTraceUploadURL)) { |
| 732 tracing::SetupNavigationTracing(); | 732 tracing::SetupNavigationTracing(); |
| 733 } | 733 } |
| 734 | 734 |
| (...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1910 chromeos::CrosSettings::Shutdown(); | 1910 chromeos::CrosSettings::Shutdown(); |
| 1911 #endif // defined(OS_CHROMEOS) | 1911 #endif // defined(OS_CHROMEOS) |
| 1912 #endif // defined(OS_ANDROID) | 1912 #endif // defined(OS_ANDROID) |
| 1913 } | 1913 } |
| 1914 | 1914 |
| 1915 // Public members: | 1915 // Public members: |
| 1916 | 1916 |
| 1917 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1917 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1918 chrome_extra_parts_.push_back(parts); | 1918 chrome_extra_parts_.push_back(parts); |
| 1919 } | 1919 } |
| OLD | NEW |