| 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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 | 489 |
| 490 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); | 490 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); |
| 491 | 491 |
| 492 if (delegate_ && delegate_->IsOverridingUserAgent()) | 492 if (delegate_ && delegate_->IsOverridingUserAgent()) |
| 493 prefs.viewport_meta_enabled = false; | 493 prefs.viewport_meta_enabled = false; |
| 494 | 494 |
| 495 prefs.main_frame_resizes_are_orientation_changes = | 495 prefs.main_frame_resizes_are_orientation_changes = |
| 496 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); | 496 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); |
| 497 | 497 |
| 498 prefs.color_correct_rendering_enabled = | 498 prefs.color_correct_rendering_enabled = |
| 499 command_line.HasSwitch(cc::switches::kEnableColorCorrectRendering) || | 499 command_line.HasSwitch(cc::switches::kEnableColorCorrectRendering); |
| 500 command_line.HasSwitch(cc::switches::kEnableTrueColorRendering); | |
| 501 | 500 |
| 502 prefs.color_correct_rendering_default_mode_enabled = | 501 prefs.color_correct_rendering_default_mode_enabled = |
| 503 command_line.HasSwitch( | 502 command_line.HasSwitch( |
| 504 switches::kEnableColorCorrectRenderingDefaultMode); | 503 switches::kEnableColorCorrectRenderingDefaultMode); |
| 505 | 504 |
| 506 prefs.true_color_rendering_enabled = | |
| 507 command_line.HasSwitch(cc::switches::kEnableTrueColorRendering); | |
| 508 | |
| 509 prefs.spatial_navigation_enabled = command_line.HasSwitch( | 505 prefs.spatial_navigation_enabled = command_line.HasSwitch( |
| 510 switches::kEnableSpatialNavigation); | 506 switches::kEnableSpatialNavigation); |
| 511 | 507 |
| 512 prefs.disable_reading_from_canvas = command_line.HasSwitch( | 508 prefs.disable_reading_from_canvas = command_line.HasSwitch( |
| 513 switches::kDisableReadingFromCanvas); | 509 switches::kDisableReadingFromCanvas); |
| 514 | 510 |
| 515 prefs.strict_mixed_content_checking = command_line.HasSwitch( | 511 prefs.strict_mixed_content_checking = command_line.HasSwitch( |
| 516 switches::kEnableStrictMixedContentChecking); | 512 switches::kEnableStrictMixedContentChecking); |
| 517 | 513 |
| 518 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( | 514 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 } | 952 } |
| 957 | 953 |
| 958 void RenderViewHostImpl::ClosePageTimeout() { | 954 void RenderViewHostImpl::ClosePageTimeout() { |
| 959 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) | 955 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) |
| 960 return; | 956 return; |
| 961 | 957 |
| 962 ClosePageIgnoringUnloadEvents(); | 958 ClosePageIgnoringUnloadEvents(); |
| 963 } | 959 } |
| 964 | 960 |
| 965 } // namespace content | 961 } // namespace content |
| OLD | NEW |