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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/gpu/gl_string_manager.h" | 58 #include "chrome/browser/gpu/gl_string_manager.h" |
59 #include "chrome/browser/gpu/three_d_api_observer.h" | 59 #include "chrome/browser/gpu/three_d_api_observer.h" |
60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
61 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 61 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
62 #include "chrome/browser/metrics/thread_watcher.h" | 62 #include "chrome/browser/metrics/thread_watcher.h" |
63 #include "chrome/browser/metrics/tracking_synchronizer.h" | 63 #include "chrome/browser/metrics/tracking_synchronizer.h" |
64 #include "chrome/browser/metrics/variations/variations_service.h" | 64 #include "chrome/browser/metrics/variations/variations_service.h" |
65 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | |
66 #include "chrome/browser/net/chrome_net_log.h" | 65 #include "chrome/browser/net/chrome_net_log.h" |
67 #include "chrome/browser/net/crl_set_fetcher.h" | 66 #include "chrome/browser/net/crl_set_fetcher.h" |
68 #include "chrome/browser/notifications/desktop_notification_service.h" | 67 #include "chrome/browser/notifications/desktop_notification_service.h" |
69 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 68 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
70 #include "chrome/browser/performance_monitor/performance_monitor.h" | 69 #include "chrome/browser/performance_monitor/performance_monitor.h" |
71 #include "chrome/browser/performance_monitor/startup_timer.h" | 70 #include "chrome/browser/performance_monitor/startup_timer.h" |
72 #include "chrome/browser/plugins/plugin_prefs.h" | 71 #include "chrome/browser/plugins/plugin_prefs.h" |
73 #include "chrome/browser/pref_service_flags_storage.h" | 72 #include "chrome/browser/pref_service_flags_storage.h" |
74 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 73 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
75 #include "chrome/browser/prefs/command_line_pref_store.h" | 74 #include "chrome/browser/prefs/command_line_pref_store.h" |
(...skipping 22 matching lines...) Expand all Loading... |
98 #include "chrome/common/crash_keys.h" | 97 #include "chrome/common/crash_keys.h" |
99 #include "chrome/common/env_vars.h" | 98 #include "chrome/common/env_vars.h" |
100 #include "chrome/common/logging_chrome.h" | 99 #include "chrome/common/logging_chrome.h" |
101 #include "chrome/common/net/net_resource_provider.h" | 100 #include "chrome/common/net/net_resource_provider.h" |
102 #include "chrome/common/pref_names.h" | 101 #include "chrome/common/pref_names.h" |
103 #include "chrome/common/profiling.h" | 102 #include "chrome/common/profiling.h" |
104 #include "chrome/installer/util/google_update_settings.h" | 103 #include "chrome/installer/util/google_update_settings.h" |
105 #include "components/google/core/browser/google_util.h" | 104 #include "components/google/core/browser/google_util.h" |
106 #include "components/language_usage_metrics/language_usage_metrics.h" | 105 #include "components/language_usage_metrics/language_usage_metrics.h" |
107 #include "components/metrics/metrics_service.h" | 106 #include "components/metrics/metrics_service.h" |
108 #include "components/nacl/browser/nacl_browser.h" | |
109 #include "components/rappor/rappor_service.h" | 107 #include "components/rappor/rappor_service.h" |
110 #include "components/signin/core/common/profile_management_switches.h" | 108 #include "components/signin/core/common/profile_management_switches.h" |
111 #include "components/startup_metric_utils/startup_metric_utils.h" | 109 #include "components/startup_metric_utils/startup_metric_utils.h" |
112 #include "components/translate/content/common/cld_data_source.h" | 110 #include "components/translate/content/common/cld_data_source.h" |
113 #include "components/translate/core/browser/translate_download_manager.h" | 111 #include "components/translate/core/browser/translate_download_manager.h" |
114 #include "components/variations/variations_http_header_provider.h" | 112 #include "components/variations/variations_http_header_provider.h" |
115 #include "content/public/browser/browser_thread.h" | 113 #include "content/public/browser/browser_thread.h" |
116 #include "content/public/browser/notification_observer.h" | 114 #include "content/public/browser/notification_observer.h" |
117 #include "content/public/browser/notification_registrar.h" | 115 #include "content/public/browser/notification_registrar.h" |
118 #include "content/public/browser/notification_service.h" | 116 #include "content/public/browser/notification_service.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 #endif // defined(OS_WIN) | 175 #endif // defined(OS_WIN) |
178 | 176 |
179 #if defined(OS_MACOSX) | 177 #if defined(OS_MACOSX) |
180 #include <Security/Security.h> | 178 #include <Security/Security.h> |
181 | 179 |
182 #include "base/mac/scoped_nsautorelease_pool.h" | 180 #include "base/mac/scoped_nsautorelease_pool.h" |
183 #include "chrome/browser/mac/keystone_glue.h" | 181 #include "chrome/browser/mac/keystone_glue.h" |
184 #endif | 182 #endif |
185 | 183 |
186 #if !defined(DISABLE_NACL) | 184 #if !defined(DISABLE_NACL) |
| 185 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 186 #include "components/nacl/browser/nacl_browser.h" |
187 #include "components/nacl/browser/nacl_process_host.h" | 187 #include "components/nacl/browser/nacl_process_host.h" |
188 #endif | 188 #endif |
189 | 189 |
190 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) | 190 #if defined(ENABLE_FULL_PRINTING) && !defined(OFFICIAL_BUILD) |
191 #include "printing/printed_document.h" | 191 #include "printing/printed_document.h" |
192 #endif | 192 #endif |
193 | 193 |
194 #if defined(ENABLE_RLZ) | 194 #if defined(ENABLE_RLZ) |
195 #include "chrome/browser/rlz/rlz.h" | 195 #include "chrome/browser/rlz/rlz.h" |
196 #endif | 196 #endif |
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1651 chromeos::CrosSettings::Shutdown(); | 1651 chromeos::CrosSettings::Shutdown(); |
1652 #endif | 1652 #endif |
1653 #endif | 1653 #endif |
1654 } | 1654 } |
1655 | 1655 |
1656 // Public members: | 1656 // Public members: |
1657 | 1657 |
1658 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1658 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1659 chrome_extra_parts_.push_back(parts); | 1659 chrome_extra_parts_.push_back(parts); |
1660 } | 1660 } |
OLD | NEW |