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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 command_line.HasSwitch(switches::kEnableThreadedCompositing); | 1213 command_line.HasSwitch(switches::kEnableThreadedCompositing); |
1214 web_prefs.force_compositing_mode = | 1214 web_prefs.force_compositing_mode = |
1215 command_line.HasSwitch(switches::kForceCompositingMode); | 1215 command_line.HasSwitch(switches::kForceCompositingMode); |
1216 web_prefs.fixed_position_compositing_enabled = | 1216 web_prefs.fixed_position_compositing_enabled = |
1217 command_line.HasSwitch(switches::kEnableCompositingForFixedPosition); | 1217 command_line.HasSwitch(switches::kEnableCompositingForFixedPosition); |
1218 web_prefs.allow_webui_compositing = | 1218 web_prefs.allow_webui_compositing = |
1219 command_line.HasSwitch(switches::kAllowWebUICompositing); | 1219 command_line.HasSwitch(switches::kAllowWebUICompositing); |
1220 web_prefs.accelerated_2d_canvas_enabled = | 1220 web_prefs.accelerated_2d_canvas_enabled = |
1221 GpuProcessHost::gpu_enabled() && | 1221 GpuProcessHost::gpu_enabled() && |
1222 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); | 1222 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); |
| 1223 web_prefs.deferred_2d_canvas_enabled = |
| 1224 command_line.HasSwitch(switches::kEnableDeferred2dCanvas); |
1223 web_prefs.accelerated_painting_enabled = | 1225 web_prefs.accelerated_painting_enabled = |
1224 GpuProcessHost::gpu_enabled() && | 1226 GpuProcessHost::gpu_enabled() && |
1225 command_line.HasSwitch(switches::kEnableAcceleratedPainting); | 1227 command_line.HasSwitch(switches::kEnableAcceleratedPainting); |
1226 web_prefs.accelerated_filters_enabled = | 1228 web_prefs.accelerated_filters_enabled = |
1227 GpuProcessHost::gpu_enabled() && | 1229 GpuProcessHost::gpu_enabled() && |
1228 command_line.HasSwitch(switches::kEnableAcceleratedFilters); | 1230 command_line.HasSwitch(switches::kEnableAcceleratedFilters); |
1229 web_prefs.accelerated_layers_enabled = | 1231 web_prefs.accelerated_layers_enabled = |
1230 web_prefs.accelerated_animation_enabled = | 1232 web_prefs.accelerated_animation_enabled = |
1231 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); | 1233 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); |
1232 web_prefs.composite_to_texture_enabled = | 1234 web_prefs.composite_to_texture_enabled = |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1451 #if defined(USE_NSS) | 1453 #if defined(USE_NSS) |
1452 crypto::CryptoModuleBlockingPasswordDelegate* | 1454 crypto::CryptoModuleBlockingPasswordDelegate* |
1453 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1455 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1454 const GURL& url) { | 1456 const GURL& url) { |
1455 return browser::NewCryptoModuleBlockingDialogDelegate( | 1457 return browser::NewCryptoModuleBlockingDialogDelegate( |
1456 browser::kCryptoModulePasswordKeygen, url.host()); | 1458 browser::kCryptoModulePasswordKeygen, url.host()); |
1457 } | 1459 } |
1458 #endif | 1460 #endif |
1459 | 1461 |
1460 } // namespace chrome | 1462 } // namespace chrome |
OLD | NEW |