| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 #include "chrome/common/crash_keys.h" | 113 #include "chrome/common/crash_keys.h" |
| 114 #include "chrome/common/env_vars.h" | 114 #include "chrome/common/env_vars.h" |
| 115 #include "chrome/common/features.h" | 115 #include "chrome/common/features.h" |
| 116 #include "chrome/common/logging_chrome.h" | 116 #include "chrome/common/logging_chrome.h" |
| 117 #include "chrome/common/media/media_resource_provider.h" | 117 #include "chrome/common/media/media_resource_provider.h" |
| 118 #include "chrome/common/net/net_resource_provider.h" | 118 #include "chrome/common/net/net_resource_provider.h" |
| 119 #include "chrome/common/pref_names.h" | 119 #include "chrome/common/pref_names.h" |
| 120 #include "chrome/common/profiling.h" | 120 #include "chrome/common/profiling.h" |
| 121 #include "chrome/common/variations/variations_util.h" | 121 #include "chrome/common/variations/variations_util.h" |
| 122 #include "chrome/grit/generated_resources.h" | 122 #include "chrome/grit/generated_resources.h" |
| 123 #include "chrome/grit/platform_locale_settings.h" | |
| 124 #include "chrome/installer/util/google_update_settings.h" | 123 #include "chrome/installer/util/google_update_settings.h" |
| 125 #include "components/component_updater/component_updater_service.h" | 124 #include "components/component_updater/component_updater_service.h" |
| 126 #include "components/device_event_log/device_event_log.h" | 125 #include "components/device_event_log/device_event_log.h" |
| 127 #include "components/flags_ui/pref_service_flags_storage.h" | 126 #include "components/flags_ui/pref_service_flags_storage.h" |
| 128 #include "components/google/core/browser/google_util.h" | 127 #include "components/google/core/browser/google_util.h" |
| 129 #include "components/language_usage_metrics/language_usage_metrics.h" | 128 #include "components/language_usage_metrics/language_usage_metrics.h" |
| 130 #include "components/metrics/call_stack_profile_metrics_provider.h" | 129 #include "components/metrics/call_stack_profile_metrics_provider.h" |
| 131 #include "components/metrics/metrics_reporting_default_state.h" | 130 #include "components/metrics/metrics_reporting_default_state.h" |
| 132 #include "components/metrics/metrics_service.h" | 131 #include "components/metrics/metrics_service.h" |
| 133 #include "components/metrics/profiler/content/content_tracking_synchronizer_dele
gate.h" | 132 #include "components/metrics/profiler/content/content_tracking_synchronizer_dele
gate.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 #include "media/base/media_resources.h" | 165 #include "media/base/media_resources.h" |
| 167 #include "net/base/net_module.h" | 166 #include "net/base/net_module.h" |
| 168 #include "net/cookies/cookie_monster.h" | 167 #include "net/cookies/cookie_monster.h" |
| 169 #include "net/http/http_network_layer.h" | 168 #include "net/http/http_network_layer.h" |
| 170 #include "net/http/http_stream_factory.h" | 169 #include "net/http/http_stream_factory.h" |
| 171 #include "net/url_request/url_request.h" | 170 #include "net/url_request/url_request.h" |
| 172 #include "ui/base/l10n/l10n_util.h" | 171 #include "ui/base/l10n/l10n_util.h" |
| 173 #include "ui/base/layout.h" | 172 #include "ui/base/layout.h" |
| 174 #include "ui/base/material_design/material_design_controller.h" | 173 #include "ui/base/material_design/material_design_controller.h" |
| 175 #include "ui/base/resource/resource_bundle.h" | 174 #include "ui/base/resource/resource_bundle.h" |
| 176 #include "ui/strings/grit/app_locale_settings.h" | |
| 177 | 175 |
| 178 #if BUILDFLAG(ANDROID_JAVA_UI) | 176 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 179 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" | 177 #include "chrome/browser/android/dev_tools_discovery_provider_android.h" |
| 180 #else | 178 #else |
| 181 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h" | 179 #include "chrome/browser/devtools/chrome_devtools_discovery_provider.h" |
| 182 #endif | 180 #endif |
| 183 | 181 |
| 184 #if defined(OS_ANDROID) | 182 #if defined(OS_ANDROID) |
| 185 #include "chrome/browser/metrics/thread_watcher_android.h" | 183 #include "chrome/browser/metrics/thread_watcher_android.h" |
| 186 #include "ui/base/resource/resource_bundle_android.h" | 184 #include "ui/base/resource/resource_bundle_android.h" |
| (...skipping 2037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2224 chromeos::CrosSettings::Shutdown(); | 2222 chromeos::CrosSettings::Shutdown(); |
| 2225 #endif // defined(OS_CHROMEOS) | 2223 #endif // defined(OS_CHROMEOS) |
| 2226 #endif // defined(OS_ANDROID) | 2224 #endif // defined(OS_ANDROID) |
| 2227 } | 2225 } |
| 2228 | 2226 |
| 2229 // Public members: | 2227 // Public members: |
| 2230 | 2228 |
| 2231 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2229 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2232 chrome_extra_parts_.push_back(parts); | 2230 chrome_extra_parts_.push_back(parts); |
| 2233 } | 2231 } |
| OLD | NEW |