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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 // Certain GPU features might have been blacklisted. | 454 // Certain GPU features might have been blacklisted. |
455 GpuDataManagerImpl::GetInstance()->UpdateRendererWebPrefs(&prefs); | 455 GpuDataManagerImpl::GetInstance()->UpdateRendererWebPrefs(&prefs); |
456 | 456 |
457 if (ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( | 457 if (ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( |
458 GetProcess()->GetID())) { | 458 GetProcess()->GetID())) { |
459 prefs.loads_images_automatically = true; | 459 prefs.loads_images_automatically = true; |
460 prefs.javascript_enabled = true; | 460 prefs.javascript_enabled = true; |
461 } | 461 } |
462 | 462 |
463 prefs.is_online = !net::NetworkChangeNotifier::IsOffline(); | 463 prefs.is_online = !net::NetworkChangeNotifier::IsOffline(); |
| 464 prefs.connection_type = net::NetworkChangeNotifier::GetConnectionType(); |
464 | 465 |
465 prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch( | 466 prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch( |
466 switches::kDisableFixedPositionCreatesStackingContext); | 467 switches::kDisableFixedPositionCreatesStackingContext); |
467 | 468 |
468 prefs.gesture_tap_highlight_enabled = !command_line.HasSwitch( | 469 prefs.gesture_tap_highlight_enabled = !command_line.HasSwitch( |
469 switches::kDisableGestureTapHighlight); | 470 switches::kDisableGestureTapHighlight); |
470 | 471 |
471 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); | 472 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); |
472 | 473 |
473 prefs.viewport_meta_enabled = | 474 prefs.viewport_meta_enabled = |
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1683 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1684 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1684 | 1685 |
1685 frame_tree->ResetForMainFrameSwap(); | 1686 frame_tree->ResetForMainFrameSwap(); |
1686 } | 1687 } |
1687 | 1688 |
1688 void RenderViewHostImpl::SelectWordAroundCaret() { | 1689 void RenderViewHostImpl::SelectWordAroundCaret() { |
1689 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1690 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1690 } | 1691 } |
1691 | 1692 |
1692 } // namespace content | 1693 } // namespace content |
OLD | NEW |