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 "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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 | 516 |
517 prefs.disable_reading_from_canvas = command_line.HasSwitch( | 517 prefs.disable_reading_from_canvas = command_line.HasSwitch( |
518 switches::kDisableReadingFromCanvas); | 518 switches::kDisableReadingFromCanvas); |
519 | 519 |
520 prefs.strict_mixed_content_checking = command_line.HasSwitch( | 520 prefs.strict_mixed_content_checking = command_line.HasSwitch( |
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 = |
| 527 base::FieldTrialList::FindFullName("BlockableMixedContent"); |
| 528 prefs.strictly_block_blockable_mixed_content = |
| 529 blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent"; |
| 530 |
526 prefs.v8_cache_options = GetV8CacheOptions(); | 531 prefs.v8_cache_options = GetV8CacheOptions(); |
527 | 532 |
528 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); | 533 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); |
529 return prefs; | 534 return prefs; |
530 } | 535 } |
531 | 536 |
532 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { | 537 void RenderViewHostImpl::SuppressDialogsUntilSwapOut() { |
533 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); | 538 Send(new ViewMsg_SuppressDialogsUntilSwapOut(GetRoutingID())); |
534 } | 539 } |
535 | 540 |
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1417 if (!policy->CanReadFile(GetProcess()->GetID(), file)) | 1422 if (!policy->CanReadFile(GetProcess()->GetID(), file)) |
1418 policy->GrantReadFile(GetProcess()->GetID(), file); | 1423 policy->GrantReadFile(GetProcess()->GetID(), file); |
1419 } | 1424 } |
1420 } | 1425 } |
1421 | 1426 |
1422 void RenderViewHostImpl::SelectWordAroundCaret() { | 1427 void RenderViewHostImpl::SelectWordAroundCaret() { |
1423 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1428 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1424 } | 1429 } |
1425 | 1430 |
1426 } // namespace content | 1431 } // namespace content |
OLD | NEW |