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

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

Issue 293093010: Rename RenderProcessHost::IsGuest to RenderProcessHost::IsIsolatedGuest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_isguest_chrome_callsites
Patch Set: Fixed interactive_ui_tests build Created 6 years, 6 months 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
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 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
938 #endif 938 #endif
939 if (switches::IsNewProfileManagement()) 939 if (switches::IsNewProfileManagement())
940 host->AddFilter(new PrincipalsMessageFilter(id)); 940 host->AddFilter(new PrincipalsMessageFilter(id));
941 941
942 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 942 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
943 profile->IsOffTheRecord())); 943 profile->IsOffTheRecord()));
944 944
945 SendExtensionWebRequestStatusToHost(host); 945 SendExtensionWebRequestStatusToHost(host);
946 946
947 RendererContentSettingRules rules; 947 RendererContentSettingRules rules;
948 if (host->IsGuest()) { 948 if (host->IsIsolatedGuest()) {
949 GuestViewBase::GetDefaultContentSettingRules(&rules, 949 GuestViewBase::GetDefaultContentSettingRules(&rules,
950 profile->IsOffTheRecord()); 950 profile->IsOffTheRecord());
951 } else { 951 } else {
952 GetRendererContentSettingRules( 952 GetRendererContentSettingRules(
953 profile->GetHostContentSettingsMap(), &rules); 953 profile->GetHostContentSettingsMap(), &rules);
954 } 954 }
955 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); 955 host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
956 } 956 }
957 957
958 GURL ChromeContentBrowserClient::GetEffectiveURL( 958 GURL ChromeContentBrowserClient::GetEffectiveURL(
(...skipping 1797 matching lines...) Expand 10 before | Expand all | Expand 10 after
2756 switches::kDisableWebRtcEncryption, 2756 switches::kDisableWebRtcEncryption,
2757 }; 2757 };
2758 to_command_line->CopySwitchesFrom(from_command_line, 2758 to_command_line->CopySwitchesFrom(from_command_line,
2759 kWebRtcDevSwitchNames, 2759 kWebRtcDevSwitchNames,
2760 arraysize(kWebRtcDevSwitchNames)); 2760 arraysize(kWebRtcDevSwitchNames));
2761 } 2761 }
2762 } 2762 }
2763 #endif // defined(ENABLE_WEBRTC) 2763 #endif // defined(ENABLE_WEBRTC)
2764 2764
2765 } // namespace chrome 2765 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/extensions/user_script_master.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698