| 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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 | 533 |
| 534 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); | 534 prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); |
| 535 | 535 |
| 536 if (delegate_ && delegate_->IsOverridingUserAgent()) | 536 if (delegate_ && delegate_->IsOverridingUserAgent()) |
| 537 prefs.viewport_meta_enabled = false; | 537 prefs.viewport_meta_enabled = false; |
| 538 | 538 |
| 539 prefs.main_frame_resizes_are_orientation_changes = | 539 prefs.main_frame_resizes_are_orientation_changes = |
| 540 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); | 540 command_line.HasSwitch(switches::kMainFrameResizesAreOrientationChanges); |
| 541 | 541 |
| 542 prefs.color_correct_rendering_enabled = | 542 prefs.color_correct_rendering_enabled = |
| 543 command_line.HasSwitch(switches::kEnableColorCorrectRendering); | 543 command_line.HasSwitch(cc::switches::kEnableColorCorrectRendering); |
| 544 | 544 |
| 545 prefs.spatial_navigation_enabled = command_line.HasSwitch( | 545 prefs.spatial_navigation_enabled = command_line.HasSwitch( |
| 546 switches::kEnableSpatialNavigation); | 546 switches::kEnableSpatialNavigation); |
| 547 | 547 |
| 548 prefs.disable_reading_from_canvas = command_line.HasSwitch( | 548 prefs.disable_reading_from_canvas = command_line.HasSwitch( |
| 549 switches::kDisableReadingFromCanvas); | 549 switches::kDisableReadingFromCanvas); |
| 550 | 550 |
| 551 prefs.strict_mixed_content_checking = command_line.HasSwitch( | 551 prefs.strict_mixed_content_checking = command_line.HasSwitch( |
| 552 switches::kEnableStrictMixedContentChecking); | 552 switches::kEnableStrictMixedContentChecking); |
| 553 | 553 |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1318 // Note: We are using the origin URL provided by the sender here. It may be | 1318 // Note: We are using the origin URL provided by the sender here. It may be |
| 1319 // different from the receiver's. | 1319 // different from the receiver's. |
| 1320 file_system_file.url = | 1320 file_system_file.url = |
| 1321 GURL(storage::GetIsolatedFileSystemRootURIString( | 1321 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1322 file_system_url.origin(), filesystem_id, std::string()) | 1322 file_system_url.origin(), filesystem_id, std::string()) |
| 1323 .append(register_name)); | 1323 .append(register_name)); |
| 1324 } | 1324 } |
| 1325 } | 1325 } |
| 1326 | 1326 |
| 1327 } // namespace content | 1327 } // namespace content |
| OLD | NEW |