| 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 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #include "chrome/browser/component_updater/sth_set_component_installer.h" | 64 #include "chrome/browser/component_updater/sth_set_component_installer.h" |
| 65 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" | 65 #include "chrome/browser/component_updater/subresource_filter_component_installe
r.h" |
| 66 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 66 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 67 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 67 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 68 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 68 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 69 #include "chrome/browser/defaults.h" | 69 #include "chrome/browser/defaults.h" |
| 70 #include "chrome/browser/first_run/first_run.h" | 70 #include "chrome/browser/first_run/first_run.h" |
| 71 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 71 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 72 #include "chrome/browser/gpu/gpu_profile_cache.h" | 72 #include "chrome/browser/gpu/gpu_profile_cache.h" |
| 73 #include "chrome/browser/gpu/three_d_api_observer.h" | 73 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 74 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 74 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" |
| 75 #include "chrome/browser/memory/tab_manager.h" | 75 #include "chrome/browser/memory/tab_manager.h" |
| 76 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 76 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 77 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 77 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| 78 #include "chrome/browser/metrics/thread_watcher.h" | 78 #include "chrome/browser/metrics/thread_watcher.h" |
| 79 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 79 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 80 #include "chrome/browser/net/crl_set_fetcher.h" | 80 #include "chrome/browser/net/crl_set_fetcher.h" |
| 81 #include "chrome/browser/performance_monitor/performance_monitor.h" | 81 #include "chrome/browser/performance_monitor/performance_monitor.h" |
| 82 #include "chrome/browser/plugins/plugin_prefs.h" | 82 #include "chrome/browser/plugins/plugin_prefs.h" |
| 83 #include "chrome/browser/power/process_power_collector.h" | 83 #include "chrome/browser/power/process_power_collector.h" |
| 84 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 84 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 249 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 250 #include "printing/printed_document.h" | 250 #include "printing/printed_document.h" |
| 251 #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 251 #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 252 | 252 |
| 253 #if defined(ENABLE_RLZ) | 253 #if defined(ENABLE_RLZ) |
| 254 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" | 254 #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" |
| 255 #include "components/rlz/rlz_tracker.h" | 255 #include "components/rlz/rlz_tracker.h" |
| 256 #endif // defined(ENABLE_RLZ) | 256 #endif // defined(ENABLE_RLZ) |
| 257 | 257 |
| 258 #if defined(ENABLE_WEBRTC) | 258 #if defined(ENABLE_WEBRTC) |
| 259 #include "chrome/browser/media/webrtc_log_util.h" | 259 #include "chrome/browser/media/webrtc/webrtc_log_util.h" |
| 260 #endif // defined(ENABLE_WEBRTC) | 260 #endif // defined(ENABLE_WEBRTC) |
| 261 | 261 |
| 262 #if defined(USE_AURA) | 262 #if defined(USE_AURA) |
| 263 #include "ui/aura/env.h" | 263 #include "ui/aura/env.h" |
| 264 #endif // defined(USE_AURA) | 264 #endif // defined(USE_AURA) |
| 265 | 265 |
| 266 #if !defined(OS_ANDROID) | 266 #if !defined(OS_ANDROID) |
| 267 #include "chrome/browser/usb/web_usb_detector.h" | 267 #include "chrome/browser/usb/web_usb_detector.h" |
| 268 #endif | 268 #endif |
| 269 | 269 |
| (...skipping 1937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2207 chromeos::CrosSettings::Shutdown(); | 2207 chromeos::CrosSettings::Shutdown(); |
| 2208 #endif // defined(OS_CHROMEOS) | 2208 #endif // defined(OS_CHROMEOS) |
| 2209 #endif // defined(OS_ANDROID) | 2209 #endif // defined(OS_ANDROID) |
| 2210 } | 2210 } |
| 2211 | 2211 |
| 2212 // Public members: | 2212 // Public members: |
| 2213 | 2213 |
| 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2214 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2215 chrome_extra_parts_.push_back(parts); | 2215 chrome_extra_parts_.push_back(parts); |
| 2216 } | 2216 } |
| OLD | NEW |