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 <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 50 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
51 #include "chrome/browser/defaults.h" | 51 #include "chrome/browser/defaults.h" |
52 #include "chrome/browser/first_run/first_run.h" | 52 #include "chrome/browser/first_run/first_run.h" |
53 #include "chrome/browser/first_run/upgrade_util.h" | 53 #include "chrome/browser/first_run/upgrade_util.h" |
54 #include "chrome/browser/google/google_search_counter.h" | 54 #include "chrome/browser/google/google_search_counter.h" |
55 #include "chrome/browser/gpu/gl_string_manager.h" | 55 #include "chrome/browser/gpu/gl_string_manager.h" |
56 #include "chrome/browser/gpu/three_d_api_observer.h" | 56 #include "chrome/browser/gpu/three_d_api_observer.h" |
57 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 57 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
58 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 58 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
59 #include "chrome/browser/metrics/thread_watcher.h" | 59 #include "chrome/browser/metrics/thread_watcher.h" |
60 #include "chrome/browser/metrics/tracking_synchronizer.h" | |
61 #include "chrome/browser/metrics/variations/variations_service.h" | 60 #include "chrome/browser/metrics/variations/variations_service.h" |
62 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 61 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
63 #include "chrome/browser/net/chrome_net_log.h" | 62 #include "chrome/browser/net/chrome_net_log.h" |
64 #include "chrome/browser/net/crl_set_fetcher.h" | 63 #include "chrome/browser/net/crl_set_fetcher.h" |
65 #include "chrome/browser/notifications/desktop_notification_service.h" | 64 #include "chrome/browser/notifications/desktop_notification_service.h" |
66 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 65 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
67 #include "chrome/browser/performance_monitor/performance_monitor.h" | 66 #include "chrome/browser/performance_monitor/performance_monitor.h" |
68 #include "chrome/browser/plugins/plugin_prefs.h" | 67 #include "chrome/browser/plugins/plugin_prefs.h" |
69 #include "chrome/browser/power/process_power_collector.h" | 68 #include "chrome/browser/power/process_power_collector.h" |
70 #include "chrome/browser/pref_service_flags_storage.h" | 69 #include "chrome/browser/pref_service_flags_storage.h" |
(...skipping 26 matching lines...) Expand all Loading... |
97 #include "chrome/common/logging_chrome.h" | 96 #include "chrome/common/logging_chrome.h" |
98 #include "chrome/common/net/net_resource_provider.h" | 97 #include "chrome/common/net/net_resource_provider.h" |
99 #include "chrome/common/pref_names.h" | 98 #include "chrome/common/pref_names.h" |
100 #include "chrome/common/profiling.h" | 99 #include "chrome/common/profiling.h" |
101 #include "chrome/grit/generated_resources.h" | 100 #include "chrome/grit/generated_resources.h" |
102 #include "chrome/installer/util/google_update_settings.h" | 101 #include "chrome/installer/util/google_update_settings.h" |
103 #include "components/component_updater/component_updater_service.h" | 102 #include "components/component_updater/component_updater_service.h" |
104 #include "components/google/core/browser/google_util.h" | 103 #include "components/google/core/browser/google_util.h" |
105 #include "components/language_usage_metrics/language_usage_metrics.h" | 104 #include "components/language_usage_metrics/language_usage_metrics.h" |
106 #include "components/metrics/metrics_service.h" | 105 #include "components/metrics/metrics_service.h" |
| 106 #include "components/metrics/profiler/tracking_synchronizer.h" |
107 #include "components/nacl/browser/nacl_browser.h" | 107 #include "components/nacl/browser/nacl_browser.h" |
108 #include "components/rappor/rappor_service.h" | 108 #include "components/rappor/rappor_service.h" |
109 #include "components/signin/core/common/profile_management_switches.h" | 109 #include "components/signin/core/common/profile_management_switches.h" |
110 #include "components/startup_metric_utils/startup_metric_utils.h" | 110 #include "components/startup_metric_utils/startup_metric_utils.h" |
111 #include "components/translate/content/common/cld_data_source.h" | 111 #include "components/translate/content/common/cld_data_source.h" |
112 #include "components/translate/core/browser/translate_download_manager.h" | 112 #include "components/translate/core/browser/translate_download_manager.h" |
113 #include "components/variations/variations_http_header_provider.h" | 113 #include "components/variations/variations_http_header_provider.h" |
114 #include "content/public/browser/browser_thread.h" | 114 #include "content/public/browser/browser_thread.h" |
115 #include "content/public/browser/notification_observer.h" | 115 #include "content/public/browser/notification_observer.h" |
116 #include "content/public/browser/notification_registrar.h" | 116 #include "content/public/browser/notification_registrar.h" |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
948 } | 948 } |
949 #endif | 949 #endif |
950 | 950 |
951 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) | 951 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) |
952 // Set the product channel for crash reports. | 952 // Set the product channel for crash reports. |
953 base::debug::SetCrashKeyValue(crash_keys::kChannel, | 953 base::debug::SetCrashKeyValue(crash_keys::kChannel, |
954 chrome::VersionInfo::GetVersionStringModifier()); | 954 chrome::VersionInfo::GetVersionStringModifier()); |
955 #endif | 955 #endif |
956 | 956 |
957 // Initialize tracking synchronizer system. | 957 // Initialize tracking synchronizer system. |
958 tracking_synchronizer_ = new chrome_browser_metrics::TrackingSynchronizer(); | 958 tracking_synchronizer_ = new metrics::TrackingSynchronizer(); |
959 | 959 |
960 #if defined(OS_MACOSX) | 960 #if defined(OS_MACOSX) |
961 // Get the Keychain API to register for distributed notifications on the main | 961 // Get the Keychain API to register for distributed notifications on the main |
962 // thread, which has a proper CFRunloop, instead of later on the I/O thread, | 962 // thread, which has a proper CFRunloop, instead of later on the I/O thread, |
963 // which doesn't. This ensures those notifications will get delivered | 963 // which doesn't. This ensures those notifications will get delivered |
964 // properly. See issue 37766. | 964 // properly. See issue 37766. |
965 // (Note that the callback mask here is empty. I don't want to register for | 965 // (Note that the callback mask here is empty. I don't want to register for |
966 // any callbacks, I just want to initialize the mechanism.) | 966 // any callbacks, I just want to initialize the mechanism.) |
967 SecKeychainAddCallback(&KeychainCallback, 0, NULL); | 967 SecKeychainAddCallback(&KeychainCallback, 0, NULL); |
968 #endif | 968 #endif |
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1681 chromeos::CrosSettings::Shutdown(); | 1681 chromeos::CrosSettings::Shutdown(); |
1682 #endif | 1682 #endif |
1683 #endif | 1683 #endif |
1684 } | 1684 } |
1685 | 1685 |
1686 // Public members: | 1686 // Public members: |
1687 | 1687 |
1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1688 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1689 chrome_extra_parts_.push_back(parts); | 1689 chrome_extra_parts_.push_back(parts); |
1690 } | 1690 } |
OLD | NEW |