Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 78303005: ContentSettings API should not interact with <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary churn Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | chrome/browser/guestview/guestview.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 #if defined(OS_ANDROID) 936 #if defined(OS_ANDROID)
937 host->AddFilter(new EncryptedMediaMessageFilterAndroid()); 937 host->AddFilter(new EncryptedMediaMessageFilterAndroid());
938 #endif 938 #endif
939 939
940 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 940 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
941 profile->IsOffTheRecord())); 941 profile->IsOffTheRecord()));
942 942
943 SendExtensionWebRequestStatusToHost(host); 943 SendExtensionWebRequestStatusToHost(host);
944 944
945 RendererContentSettingRules rules; 945 RendererContentSettingRules rules;
946 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); 946 if (host->IsGuest()) {
947 GuestView::GetDefaultContentSettingRules(&rules, profile->IsOffTheRecord());
948 } else {
949 GetRendererContentSettingRules(
950 profile->GetHostContentSettingsMap(), &rules);
951 }
947 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); 952 host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
948 } 953 }
949 954
950 GURL ChromeContentBrowserClient::GetEffectiveURL( 955 GURL ChromeContentBrowserClient::GetEffectiveURL(
951 content::BrowserContext* browser_context, const GURL& url) { 956 content::BrowserContext* browser_context, const GURL& url) {
952 Profile* profile = Profile::FromBrowserContext(browser_context); 957 Profile* profile = Profile::FromBrowserContext(browser_context);
953 if (!profile) 958 if (!profile)
954 return url; 959 return url;
955 960
956 // If the input |url| should be assigned to the Instant renderer, make its 961 // If the input |url| should be assigned to the Instant renderer, make its
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
2639 return IsExtensionOrSharedModuleWhitelisted(url, extension_set, 2644 return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
2640 allowed_file_handle_origins_) || 2645 allowed_file_handle_origins_) ||
2641 IsHostAllowedByCommandLine(url, extension_set, 2646 IsHostAllowedByCommandLine(url, extension_set,
2642 switches::kAllowNaClFileHandleAPI); 2647 switches::kAllowNaClFileHandleAPI);
2643 #else 2648 #else
2644 return false; 2649 return false;
2645 #endif 2650 #endif
2646 } 2651 }
2647 2652
2648 } // namespace chrome 2653 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | chrome/browser/guestview/guestview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698