Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11116013: [content shell] allow universal access from file URLs in layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/startup/bad_flags_prompt.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 prefs.flash_stage3d_enabled = 518 prefs.flash_stage3d_enabled =
519 GpuProcessHost::gpu_enabled() && 519 GpuProcessHost::gpu_enabled() &&
520 !command_line.HasSwitch(switches::kDisableFlashStage3d); 520 !command_line.HasSwitch(switches::kDisableFlashStage3d);
521 521
522 prefs.gl_multisampling_enabled = 522 prefs.gl_multisampling_enabled =
523 !command_line.HasSwitch(switches::kDisableGLMultisampling); 523 !command_line.HasSwitch(switches::kDisableGLMultisampling);
524 prefs.privileged_webgl_extensions_enabled = 524 prefs.privileged_webgl_extensions_enabled =
525 command_line.HasSwitch(switches::kEnablePrivilegedWebGLExtensions); 525 command_line.HasSwitch(switches::kEnablePrivilegedWebGLExtensions);
526 prefs.site_specific_quirks_enabled = 526 prefs.site_specific_quirks_enabled =
527 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); 527 !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
528 prefs.allow_universal_access_from_file_urls =
529 command_line.HasSwitch(switches::kAllowUniversalAccessFromFiles);
528 prefs.allow_file_access_from_file_urls = 530 prefs.allow_file_access_from_file_urls =
529 command_line.HasSwitch(switches::kAllowFileAccessFromFiles); 531 command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
530 prefs.show_composited_layer_borders = 532 prefs.show_composited_layer_borders =
531 command_line.HasSwitch(switches::kShowCompositedLayerBorders); 533 command_line.HasSwitch(switches::kShowCompositedLayerBorders);
532 prefs.show_composited_layer_tree = 534 prefs.show_composited_layer_tree =
533 command_line.HasSwitch(switches::kShowCompositedLayerTree); 535 command_line.HasSwitch(switches::kShowCompositedLayerTree);
534 prefs.show_fps_counter = 536 prefs.show_fps_counter =
535 command_line.HasSwitch(switches::kShowFPSCounter); 537 command_line.HasSwitch(switches::kShowFPSCounter);
536 prefs.accelerated_compositing_for_overflow_scroll_enabled = 538 prefs.accelerated_compositing_for_overflow_scroll_enabled =
537 command_line.HasSwitch( 539 command_line.HasSwitch(
(...skipping 2864 matching lines...) Expand 10 before | Expand all | Expand 10 after
3402 } 3404 }
3403 } 3405 }
3404 3406
3405 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3407 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3406 return browser_plugin_guest_.get(); 3408 return browser_plugin_guest_.get();
3407 } 3409 }
3408 3410
3409 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3411 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3410 return browser_plugin_embedder_.get(); 3412 return browser_plugin_embedder_.get();
3411 } 3413 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/bad_flags_prompt.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698