| 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 prefs.strictly_block_blockable_mixed_content = | 519 prefs.strictly_block_blockable_mixed_content = |
| 520 blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent"; | 520 blockable_mixed_content_group == "StrictlyBlockBlockableMixedContent"; |
| 521 | 521 |
| 522 const std::string plugin_mixed_content_status = | 522 const std::string plugin_mixed_content_status = |
| 523 base::FieldTrialList::FindFullName("PluginMixedContentStatus"); | 523 base::FieldTrialList::FindFullName("PluginMixedContentStatus"); |
| 524 prefs.block_mixed_plugin_content = | 524 prefs.block_mixed_plugin_content = |
| 525 plugin_mixed_content_status == "BlockableMixedContent"; | 525 plugin_mixed_content_status == "BlockableMixedContent"; |
| 526 | 526 |
| 527 prefs.v8_cache_options = GetV8CacheOptions(); | 527 prefs.v8_cache_options = GetV8CacheOptions(); |
| 528 | 528 |
| 529 prefs.v8_cache_strategies_for_cache_storage = |
| 530 GetV8CacheStrategiesForCacheStorage(); |
| 531 |
| 529 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( | 532 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( |
| 530 switches::kDisableGestureRequirementForPresentation); | 533 switches::kDisableGestureRequirementForPresentation); |
| 531 | 534 |
| 532 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); | 535 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); |
| 533 return prefs; | 536 return prefs; |
| 534 } | 537 } |
| 535 | 538 |
| 536 void RenderViewHostImpl::ClosePage() { | 539 void RenderViewHostImpl::ClosePage() { |
| 537 is_waiting_for_close_ack_ = true; | 540 is_waiting_for_close_ack_ = true; |
| 538 GetWidget()->StartHangMonitorTimeout( | 541 GetWidget()->StartHangMonitorTimeout( |
| (...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1348 } else { | 1351 } else { |
| 1349 render_view_ready_on_process_launch_ = true; | 1352 render_view_ready_on_process_launch_ = true; |
| 1350 } | 1353 } |
| 1351 } | 1354 } |
| 1352 | 1355 |
| 1353 void RenderViewHostImpl::RenderViewReady() { | 1356 void RenderViewHostImpl::RenderViewReady() { |
| 1354 delegate_->RenderViewReady(this); | 1357 delegate_->RenderViewReady(this); |
| 1355 } | 1358 } |
| 1356 | 1359 |
| 1357 } // namespace content | 1360 } // namespace content |
| OLD | NEW |