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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
49 #include "chrome/browser/component_updater/recovery_component_installer.h" | 49 #include "chrome/browser/component_updater/recovery_component_installer.h" |
50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
52 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
53 #include "chrome/browser/extensions/extension_service.h" | 53 #include "chrome/browser/extensions/extension_service.h" |
54 #include "chrome/browser/extensions/startup_helper.h" | 54 #include "chrome/browser/extensions/startup_helper.h" |
55 #include "chrome/browser/first_run/first_run.h" | 55 #include "chrome/browser/first_run/first_run.h" |
56 #include "chrome/browser/first_run/upgrade_util.h" | 56 #include "chrome/browser/first_run/upgrade_util.h" |
57 #include "chrome/browser/google/google_search_counter.h" | 57 #include "chrome/browser/google/google_search_counter.h" |
58 #include "chrome/browser/google/google_util.h" | |
59 #include "chrome/browser/gpu/gl_string_manager.h" | 58 #include "chrome/browser/gpu/gl_string_manager.h" |
60 #include "chrome/browser/gpu/three_d_api_observer.h" | 59 #include "chrome/browser/gpu/three_d_api_observer.h" |
61 #include "chrome/browser/jankometer.h" | 60 #include "chrome/browser/jankometer.h" |
62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 61 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
63 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 62 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
64 #include "chrome/browser/metrics/thread_watcher.h" | 63 #include "chrome/browser/metrics/thread_watcher.h" |
65 #include "chrome/browser/metrics/tracking_synchronizer.h" | 64 #include "chrome/browser/metrics/tracking_synchronizer.h" |
66 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" | 65 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" |
67 #include "chrome/browser/metrics/variations/variations_service.h" | 66 #include "chrome/browser/metrics/variations/variations_service.h" |
68 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 67 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
(...skipping 29 matching lines...) Expand all Loading... |
98 #include "chrome/common/chrome_paths.h" | 97 #include "chrome/common/chrome_paths.h" |
99 #include "chrome/common/chrome_result_codes.h" | 98 #include "chrome/common/chrome_result_codes.h" |
100 #include "chrome/common/chrome_switches.h" | 99 #include "chrome/common/chrome_switches.h" |
101 #include "chrome/common/crash_keys.h" | 100 #include "chrome/common/crash_keys.h" |
102 #include "chrome/common/env_vars.h" | 101 #include "chrome/common/env_vars.h" |
103 #include "chrome/common/logging_chrome.h" | 102 #include "chrome/common/logging_chrome.h" |
104 #include "chrome/common/net/net_resource_provider.h" | 103 #include "chrome/common/net/net_resource_provider.h" |
105 #include "chrome/common/pref_names.h" | 104 #include "chrome/common/pref_names.h" |
106 #include "chrome/common/profiling.h" | 105 #include "chrome/common/profiling.h" |
107 #include "chrome/installer/util/google_update_settings.h" | 106 #include "chrome/installer/util/google_update_settings.h" |
| 107 #include "components/google/core/browser/google_util.h" |
108 #include "components/language_usage_metrics/language_usage_metrics.h" | 108 #include "components/language_usage_metrics/language_usage_metrics.h" |
109 #include "components/metrics/metrics_service.h" | 109 #include "components/metrics/metrics_service.h" |
110 #include "components/nacl/browser/nacl_browser.h" | 110 #include "components/nacl/browser/nacl_browser.h" |
111 #include "components/nacl/browser/nacl_process_host.h" | 111 #include "components/nacl/browser/nacl_process_host.h" |
112 #include "components/rappor/rappor_service.h" | 112 #include "components/rappor/rappor_service.h" |
113 #include "components/signin/core/common/profile_management_switches.h" | 113 #include "components/signin/core/common/profile_management_switches.h" |
114 #include "components/startup_metric_utils/startup_metric_utils.h" | 114 #include "components/startup_metric_utils/startup_metric_utils.h" |
115 #include "components/translate/core/browser/translate_download_manager.h" | 115 #include "components/translate/core/browser/translate_download_manager.h" |
116 #include "content/public/browser/browser_thread.h" | 116 #include "content/public/browser/browser_thread.h" |
117 #include "content/public/browser/notification_observer.h" | 117 #include "content/public/browser/notification_observer.h" |
(...skipping 1531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1649 chromeos::CrosSettings::Shutdown(); | 1649 chromeos::CrosSettings::Shutdown(); |
1650 #endif | 1650 #endif |
1651 #endif | 1651 #endif |
1652 } | 1652 } |
1653 | 1653 |
1654 // Public members: | 1654 // Public members: |
1655 | 1655 |
1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1656 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1657 chrome_extra_parts_.push_back(parts); | 1657 chrome_extra_parts_.push_back(parts); |
1658 } | 1658 } |
OLD | NEW |