| 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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 if (host->IsForGuestsOnly()) { | 1098 if (host->IsForGuestsOnly()) { |
| 1099 #if BUILDFLAG(ENABLE_EXTENSIONS) | 1099 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 1100 GetGuestViewDefaultContentSettingRules(is_incognito_process, &rules); | 1100 GetGuestViewDefaultContentSettingRules(is_incognito_process, &rules); |
| 1101 #else | 1101 #else |
| 1102 NOTREACHED(); | 1102 NOTREACHED(); |
| 1103 #endif | 1103 #endif |
| 1104 } else { | 1104 } else { |
| 1105 GetRendererContentSettingRules( | 1105 GetRendererContentSettingRules( |
| 1106 HostContentSettingsMapFactory::GetForProfile(profile), &rules); | 1106 HostContentSettingsMapFactory::GetForProfile(profile), &rules); |
| 1107 } | 1107 } |
| 1108 // TODO(nigeltao): eliminate this legacy IPC. Instead, add an extra arg to | 1108 rc_interface->SetContentSettingRules(rules); |
| 1109 // the rc_interface->SetInitialConfiguration call. | |
| 1110 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | |
| 1111 } | 1109 } |
| 1112 | 1110 |
| 1113 GURL ChromeContentBrowserClient::GetEffectiveURL( | 1111 GURL ChromeContentBrowserClient::GetEffectiveURL( |
| 1114 content::BrowserContext* browser_context, const GURL& url) { | 1112 content::BrowserContext* browser_context, const GURL& url) { |
| 1115 Profile* profile = Profile::FromBrowserContext(browser_context); | 1113 Profile* profile = Profile::FromBrowserContext(browser_context); |
| 1116 if (!profile) | 1114 if (!profile) |
| 1117 return url; | 1115 return url; |
| 1118 | 1116 |
| 1119 // If the input |url| should be assigned to the Instant renderer, make its | 1117 // If the input |url| should be assigned to the Instant renderer, make its |
| 1120 // effective URL distinct from other URLs on the search provider's domain. | 1118 // effective URL distinct from other URLs on the search provider's domain. |
| (...skipping 2250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3371 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { | 3369 bool ChromeContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() { |
| 3372 return variations::GetVariationParamValue( | 3370 return variations::GetVariationParamValue( |
| 3373 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; | 3371 "BrowserScheduler", "RedirectDOMStorageTaskRunner") == "true"; |
| 3374 } | 3372 } |
| 3375 | 3373 |
| 3376 bool ChromeContentBrowserClient:: | 3374 bool ChromeContentBrowserClient:: |
| 3377 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3375 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3378 return variations::GetVariationParamValue( | 3376 return variations::GetVariationParamValue( |
| 3379 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3377 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3380 } | 3378 } |
| OLD | NEW |