| 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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 453 if (ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( | 453 if (ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( |
| 454 GetProcess()->GetID())) { | 454 GetProcess()->GetID())) { |
| 455 prefs.loads_images_automatically = true; | 455 prefs.loads_images_automatically = true; |
| 456 prefs.javascript_enabled = true; | 456 prefs.javascript_enabled = true; |
| 457 } | 457 } |
| 458 | 458 |
| 459 prefs.connection_type = net::NetworkChangeNotifier::GetConnectionType(); | 459 prefs.connection_type = net::NetworkChangeNotifier::GetConnectionType(); |
| 460 prefs.is_online = | 460 prefs.is_online = |
| 461 prefs.connection_type != net::NetworkChangeNotifier::CONNECTION_NONE; | 461 prefs.connection_type != net::NetworkChangeNotifier::CONNECTION_NONE; |
| 462 | 462 |
| 463 prefs.gesture_tap_highlight_enabled = !command_line.HasSwitch( | |
| 464 switches::kDisableGestureTapHighlight); | |
| 465 | |
| 466 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); | 463 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); |
| 467 | 464 |
| 468 prefs.viewport_meta_enabled = | 465 prefs.viewport_meta_enabled = |
| 469 command_line.HasSwitch(switches::kEnableViewportMeta); | 466 command_line.HasSwitch(switches::kEnableViewportMeta); |
| 470 | 467 |
| 471 prefs.viewport_enabled = | 468 prefs.viewport_enabled = |
| 472 command_line.HasSwitch(switches::kEnableViewport) || | 469 command_line.HasSwitch(switches::kEnableViewport) || |
| 473 prefs.viewport_meta_enabled; | 470 prefs.viewport_meta_enabled; |
| 474 | 471 |
| 475 prefs.main_frame_resizes_are_orientation_changes = | 472 prefs.main_frame_resizes_are_orientation_changes = |
| (...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1658 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1655 FrameTree* frame_tree = delegate_->GetFrameTree(); |
| 1659 | 1656 |
| 1660 frame_tree->ResetForMainFrameSwap(); | 1657 frame_tree->ResetForMainFrameSwap(); |
| 1661 } | 1658 } |
| 1662 | 1659 |
| 1663 void RenderViewHostImpl::SelectWordAroundCaret() { | 1660 void RenderViewHostImpl::SelectWordAroundCaret() { |
| 1664 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1661 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
| 1665 } | 1662 } |
| 1666 | 1663 |
| 1667 } // namespace content | 1664 } // namespace content |
| OLD | NEW |