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 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 command_line.HasSwitch(switches::kEnableViewport) || | 446 command_line.HasSwitch(switches::kEnableViewport) || |
447 prefs.viewport_meta_enabled; | 447 prefs.viewport_meta_enabled; |
448 | 448 |
449 prefs.main_frame_resizes_are_orientation_changes = | 449 prefs.main_frame_resizes_are_orientation_changes = |
450 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); | 450 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); |
451 | 451 |
452 prefs.deferred_image_decoding_enabled = | 452 prefs.deferred_image_decoding_enabled = |
453 command_line.HasSwitch(switches::kEnableDeferredImageDecoding) || | 453 command_line.HasSwitch(switches::kEnableDeferredImageDecoding) || |
454 content::IsImplSidePaintingEnabled(); | 454 content::IsImplSidePaintingEnabled(); |
455 | 455 |
| 456 prefs.image_color_profiles_enabled = |
| 457 command_line.HasSwitch(switches::kEnableImageColorProfiles); |
| 458 |
456 prefs.spatial_navigation_enabled = command_line.HasSwitch( | 459 prefs.spatial_navigation_enabled = command_line.HasSwitch( |
457 switches::kEnableSpatialNavigation); | 460 switches::kEnableSpatialNavigation); |
458 | 461 |
459 if (command_line.HasSwitch(switches::kV8CacheOptions)) { | 462 if (command_line.HasSwitch(switches::kV8CacheOptions)) { |
460 const std::string v8_cache_options = | 463 const std::string v8_cache_options = |
461 command_line.GetSwitchValueASCII(switches::kV8CacheOptions); | 464 command_line.GetSwitchValueASCII(switches::kV8CacheOptions); |
462 if (v8_cache_options == "parse") { | 465 if (v8_cache_options == "parse") { |
463 prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE; | 466 prefs.v8_cache_options = V8_CACHE_OPTIONS_PARSE; |
464 } else if (v8_cache_options == "code") { | 467 } else if (v8_cache_options == "code") { |
465 prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE; | 468 prefs.v8_cache_options = V8_CACHE_OPTIONS_CODE; |
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1415 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1418 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1416 | 1419 |
1417 frame_tree->ResetForMainFrameSwap(); | 1420 frame_tree->ResetForMainFrameSwap(); |
1418 } | 1421 } |
1419 | 1422 |
1420 void RenderViewHostImpl::SelectWordAroundCaret() { | 1423 void RenderViewHostImpl::SelectWordAroundCaret() { |
1421 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1424 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1422 } | 1425 } |
1423 | 1426 |
1424 } // namespace content | 1427 } // namespace content |
OLD | NEW |