Chromium Code Reviews| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 #include "components/prefs/pref_service.h" | 146 #include "components/prefs/pref_service.h" |
| 147 #include "components/prefs/scoped_user_pref_update.h" | 147 #include "components/prefs/scoped_user_pref_update.h" |
| 148 #include "components/rappor/public/rappor_utils.h" | 148 #include "components/rappor/public/rappor_utils.h" |
| 149 #include "components/rappor/rappor_recorder_impl.h" | 149 #include "components/rappor/rappor_recorder_impl.h" |
| 150 #include "components/rappor/rappor_service_impl.h" | 150 #include "components/rappor/rappor_service_impl.h" |
| 151 #include "components/safe_browsing/common/safe_browsing_prefs.h" | 151 #include "components/safe_browsing/common/safe_browsing_prefs.h" |
| 152 #include "components/security_interstitials/core/ssl_error_ui.h" | 152 #include "components/security_interstitials/core/ssl_error_ui.h" |
| 153 #include "components/signin/core/common/profile_management_switches.h" | 153 #include "components/signin/core/common/profile_management_switches.h" |
| 154 #include "components/spellcheck/spellcheck_build_features.h" | 154 #include "components/spellcheck/spellcheck_build_features.h" |
| 155 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" | 155 #include "components/startup_metric_utils/browser/startup_metric_host_impl.h" |
| 156 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h" | |
|
jochen (gone - plz use gerrit)
2017/06/28 07:38:30
this file shouldn't be changed in this CL, no?
kpaulhamus
2017/06/28 08:48:15
No, definitely not. fixed.
| |
| 156 #include "components/subresource_filter/content/browser/content_subresource_filt er_throttle_manager.h" | 157 #include "components/subresource_filter/content/browser/content_subresource_filt er_throttle_manager.h" |
| 157 #include "components/task_scheduler_util/browser/initialization.h" | 158 #include "components/task_scheduler_util/browser/initialization.h" |
| 158 #include "components/task_scheduler_util/common/variations_util.h" | 159 #include "components/task_scheduler_util/common/variations_util.h" |
| 159 #include "components/translate/core/common/translate_switches.h" | 160 #include "components/translate/core/common/translate_switches.h" |
| 160 #include "components/ukm/ukm_interface.h" | 161 #include "components/ukm/ukm_interface.h" |
| 161 #include "components/url_formatter/url_fixer.h" | 162 #include "components/url_formatter/url_fixer.h" |
| 162 #include "components/variations/variations_associated_data.h" | 163 #include "components/variations/variations_associated_data.h" |
| 163 #include "components/version_info/version_info.h" | 164 #include "components/version_info/version_info.h" |
| 164 #include "content/public/browser/browser_child_process_host.h" | 165 #include "content/public/browser/browser_child_process_host.h" |
| 165 #include "content/public/browser/browser_main_parts.h" | 166 #include "content/public/browser/browser_main_parts.h" |
| (...skipping 3302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3468 // displayed URL when rewriting chrome://help to chrome://settings/help. | 3469 // displayed URL when rewriting chrome://help to chrome://settings/help. |
| 3469 return url->SchemeIs(content::kChromeUIScheme) && | 3470 return url->SchemeIs(content::kChromeUIScheme) && |
| 3470 url->host() == chrome::kChromeUISettingsHost; | 3471 url->host() == chrome::kChromeUISettingsHost; |
| 3471 } | 3472 } |
| 3472 | 3473 |
| 3473 // static | 3474 // static |
| 3474 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3475 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3475 const storage::QuotaSettings* settings) { | 3476 const storage::QuotaSettings* settings) { |
| 3476 g_default_quota_settings = settings; | 3477 g_default_quota_settings = settings; |
| 3477 } | 3478 } |
| OLD | NEW |