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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 | 521 |
522 if (delegate_ && delegate_->IsOverridingUserAgent()) | 522 if (delegate_ && delegate_->IsOverridingUserAgent()) |
523 prefs.viewport_meta_enabled = false; | 523 prefs.viewport_meta_enabled = false; |
524 | 524 |
525 prefs.main_frame_resizes_are_orientation_changes = | 525 prefs.main_frame_resizes_are_orientation_changes = |
526 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); | 526 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); |
527 | 527 |
528 prefs.color_correct_rendering_enabled = | 528 prefs.color_correct_rendering_enabled = |
529 command_line.HasSwitch(switches::kEnableColorCorrectRendering); | 529 command_line.HasSwitch(switches::kEnableColorCorrectRendering); |
530 | 530 |
531 prefs.color_correct_rendering_default_mode_enabled = | |
532 command_line.HasSwitch( | |
533 switches::kEnableColorCorrectRenderingDefaultMode); | |
534 | |
535 prefs.spatial_navigation_enabled = command_line.HasSwitch( | 531 prefs.spatial_navigation_enabled = command_line.HasSwitch( |
536 switches::kEnableSpatialNavigation); | 532 switches::kEnableSpatialNavigation); |
537 | 533 |
538 prefs.disable_reading_from_canvas = command_line.HasSwitch( | 534 prefs.disable_reading_from_canvas = command_line.HasSwitch( |
539 switches::kDisableReadingFromCanvas); | 535 switches::kDisableReadingFromCanvas); |
540 | 536 |
541 prefs.strict_mixed_content_checking = command_line.HasSwitch( | 537 prefs.strict_mixed_content_checking = command_line.HasSwitch( |
542 switches::kEnableStrictMixedContentChecking); | 538 switches::kEnableStrictMixedContentChecking); |
543 | 539 |
544 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( | 540 prefs.strict_powerful_feature_restrictions = command_line.HasSwitch( |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
968 } | 964 } |
969 | 965 |
970 void RenderViewHostImpl::ClosePageTimeout() { | 966 void RenderViewHostImpl::ClosePageTimeout() { |
971 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) | 967 if (delegate_->ShouldIgnoreUnresponsiveRenderer()) |
972 return; | 968 return; |
973 | 969 |
974 ClosePageIgnoringUnloadEvents(); | 970 ClosePageIgnoringUnloadEvents(); |
975 } | 971 } |
976 | 972 |
977 } // namespace content | 973 } // namespace content |
OLD | NEW |