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_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
88 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 88 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 89 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
90 #include "chrome/browser/ui/browser_navigator.h" | 90 #include "chrome/browser/ui/browser_navigator.h" |
91 #include "chrome/browser/ui/browser_navigator_params.h" | 91 #include "chrome/browser/ui/browser_navigator_params.h" |
92 #include "chrome/browser/ui/chrome_select_file_policy.h" | 92 #include "chrome/browser/ui/chrome_select_file_policy.h" |
93 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 93 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
94 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 94 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 95 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
96 #include "chrome/browser/ui/webui/log_web_ui_url.h" | 96 #include "chrome/browser/ui/webui/log_web_ui_url.h" |
97 #include "chrome/browser/usb/usb_tab_helper.h" | 97 #include "chrome/browser/usb/usb_tab_helper.h" |
98 #include "chrome/browser/webshare/share_service_impl.h" | |
99 #include "chrome/common/channel_info.h" | 98 #include "chrome/common/channel_info.h" |
100 #include "chrome/common/chrome_constants.h" | 99 #include "chrome/common/chrome_constants.h" |
101 #include "chrome/common/chrome_features.h" | 100 #include "chrome/common/chrome_features.h" |
102 #include "chrome/common/chrome_paths.h" | 101 #include "chrome/common/chrome_paths.h" |
103 #include "chrome/common/chrome_switches.h" | 102 #include "chrome/common/chrome_switches.h" |
104 #include "chrome/common/env_vars.h" | 103 #include "chrome/common/env_vars.h" |
105 #include "chrome/common/features.h" | 104 #include "chrome/common/features.h" |
106 #include "chrome/common/logging_chrome.h" | 105 #include "chrome/common/logging_chrome.h" |
107 #include "chrome/common/origin_trials/chrome_origin_trial_policy.h" | 106 #include "chrome/common/origin_trials/chrome_origin_trial_policy.h" |
108 #include "chrome/common/pepper_permission_util.h" | 107 #include "chrome/common/pepper_permission_util.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
242 #elif defined(OS_ANDROID) | 241 #elif defined(OS_ANDROID) |
243 #include "chrome/browser/chrome_browser_main_android.h" | 242 #include "chrome/browser/chrome_browser_main_android.h" |
244 #include "chrome/common/descriptors_android.h" | 243 #include "chrome/common/descriptors_android.h" |
245 #include "components/crash/content/browser/crash_dump_manager_android.h" | 244 #include "components/crash/content/browser/crash_dump_manager_android.h" |
246 #include "components/navigation_interception/intercept_navigation_delegate.h" | 245 #include "components/navigation_interception/intercept_navigation_delegate.h" |
247 #include "ui/base/resource/resource_bundle_android.h" | 246 #include "ui/base/resource/resource_bundle_android.h" |
248 #elif defined(OS_POSIX) | 247 #elif defined(OS_POSIX) |
249 #include "chrome/browser/chrome_browser_main_posix.h" | 248 #include "chrome/browser/chrome_browser_main_posix.h" |
250 #endif | 249 #endif |
251 | 250 |
252 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) | 251 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) |
Sam McNally
2017/02/13 00:27:33
Can we remove the OS_CHROMEOS here? It would be ni
Matt Giuca
2017/02/13 00:32:42
Done. (I thought about doing this but didn't want
| |
253 #include "chrome/browser/payments/payment_request_factory.h" | 252 #include "chrome/browser/payments/payment_request_factory.h" |
253 #include "chrome/browser/webshare/share_service_impl.h" | |
254 #endif | 254 #endif |
255 | 255 |
256 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 256 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
257 #include "base/debug/leak_annotations.h" | 257 #include "base/debug/leak_annotations.h" |
258 #include "components/crash/content/app/breakpad_linux.h" | 258 #include "components/crash/content/app/breakpad_linux.h" |
259 #include "components/crash/content/browser/crash_handler_host_linux.h" | 259 #include "components/crash/content/browser/crash_handler_host_linux.h" |
260 #endif | 260 #endif |
261 | 261 |
262 #if defined(OS_ANDROID) | 262 #if defined(OS_ANDROID) |
263 #include "chrome/browser/android/chrome_context_util.h" | 263 #include "chrome/browser/android/chrome_context_util.h" |
(...skipping 3168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3432 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3432 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
3433 return variations::GetVariationParamValue( | 3433 return variations::GetVariationParamValue( |
3434 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3434 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
3435 } | 3435 } |
3436 | 3436 |
3437 //static | 3437 //static |
3438 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3438 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
3439 const storage::QuotaSettings* settings) { | 3439 const storage::QuotaSettings* settings) { |
3440 g_default_quota_settings = settings; | 3440 g_default_quota_settings = settings; |
3441 } | 3441 } |
OLD | NEW |