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 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 const std::string plugin_mixed_content_status = | 558 const std::string plugin_mixed_content_status = |
559 base::FieldTrialList::FindFullName("PluginMixedContentStatus"); | 559 base::FieldTrialList::FindFullName("PluginMixedContentStatus"); |
560 prefs.block_mixed_plugin_content = | 560 prefs.block_mixed_plugin_content = |
561 plugin_mixed_content_status == "BlockableMixedContent"; | 561 plugin_mixed_content_status == "BlockableMixedContent"; |
562 | 562 |
563 prefs.v8_cache_options = GetV8CacheOptions(); | 563 prefs.v8_cache_options = GetV8CacheOptions(); |
564 | 564 |
565 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( | 565 prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( |
566 switches::kDisableGestureRequirementForPresentation); | 566 switches::kDisableGestureRequirementForPresentation); |
567 | 567 |
| 568 if (delegate_ && delegate_->HideDownloadUI()) |
| 569 prefs.hide_download_ui = true; |
| 570 |
568 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); | 571 GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); |
569 return prefs; | 572 return prefs; |
570 } | 573 } |
571 | 574 |
572 void RenderViewHostImpl::ClosePage() { | 575 void RenderViewHostImpl::ClosePage() { |
573 is_waiting_for_close_ack_ = true; | 576 is_waiting_for_close_ack_ = true; |
574 GetWidget()->StartHangMonitorTimeout( | 577 GetWidget()->StartHangMonitorTimeout( |
575 TimeDelta::FromMilliseconds(kUnloadTimeoutMS), | 578 TimeDelta::FromMilliseconds(kUnloadTimeoutMS), |
576 blink::WebInputEvent::Undefined, | 579 blink::WebInputEvent::Undefined, |
577 RendererUnresponsiveType::RENDERER_UNRESPONSIVE_CLOSE_PAGE); | 580 RendererUnresponsiveType::RENDERER_UNRESPONSIVE_CLOSE_PAGE); |
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1315 // Note: We are using the origin URL provided by the sender here. It may be | 1318 // Note: We are using the origin URL provided by the sender here. It may be |
1316 // different from the receiver's. | 1319 // different from the receiver's. |
1317 file_system_file.url = | 1320 file_system_file.url = |
1318 GURL(storage::GetIsolatedFileSystemRootURIString( | 1321 GURL(storage::GetIsolatedFileSystemRootURIString( |
1319 file_system_url.origin(), filesystem_id, std::string()) | 1322 file_system_url.origin(), filesystem_id, std::string()) |
1320 .append(register_name)); | 1323 .append(register_name)); |
1321 } | 1324 } |
1322 } | 1325 } |
1323 | 1326 |
1324 } // namespace content | 1327 } // namespace content |
OLD | NEW |