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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1260163005: Appease jschuh@ by adding a field trial to move 'plugin' to blockable mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@settingh
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 switches::kEnableStrictMixedContentChecking); 521 switches::kEnableStrictMixedContentChecking);
522 522
523 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( 523 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch(
524 switches::kEnableStrictPowerfulFeatureRestrictions); 524 switches::kEnableStrictPowerfulFeatureRestrictions);
525 525
526 const std::string blockable_mixed_content_group = 526 const std::string blockable_mixed_content_group =
527 base::FieldTrialList::FindFullName("BlockableMixedContent"); 527 base::FieldTrialList::FindFullName("BlockableMixedContent");
528 prefs.strictly_block_blockable_mixed_content = 528 prefs.strictly_block_blockable_mixed_content =
529 blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent"; 529 blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent";
530 530
531 const std::string plugin_mixed_content_status =
532 base::FieldTrialList::FindFullName("PluginMixedContentStatus");
533 prefs.block_mixed_plugin_content =
534 plugin_mixed_content_status == "BlockableMixedContent";
535
531 prefs.v8_cache_options = GetV8CacheOptions(); 536 prefs.v8_cache_options = GetV8CacheOptions();
532 537
533 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); 538 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs);
534 return prefs; 539 return prefs;
535 } 540 }
536 541
537 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { 542 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() {
538 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); 543 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID()));
539 } 544 }
540 545
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 if (!policy->CanReadFile(GetProcess()->GetID(), file)) 1427 if (!policy->CanReadFile(GetProcess()->GetID(), file))
1423 policy->GrantReadFile(GetProcess()->GetID(), file); 1428 policy->GrantReadFile(GetProcess()->GetID(), file);
1424 } 1429 }
1425 } 1430 }
1426 1431
1427 void RenderViewHostImpl::SelectWordAroundCaret() { 1432 void RenderViewHostImpl::SelectWordAroundCaret() {
1428 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1433 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1429 } 1434 }
1430 1435
1431 } // namespace content 1436 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698