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

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

Issue 11348353: Simplify pinch flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 646
647 // TODO(scottmg): Probably Native is wrong: http://crbug.com/133312 647 // TODO(scottmg): Probably Native is wrong: http://crbug.com/133312
648 if (gfx::Screen::GetNativeScreen()->IsDIPEnabled()) { 648 if (gfx::Screen::GetNativeScreen()->IsDIPEnabled()) {
649 // Only apply when using DIP coordinate system as this setting interferes 649 // Only apply when using DIP coordinate system as this setting interferes
650 // with fixed layout mode. 650 // with fixed layout mode.
651 // TODO(danakj): Fixed layout mode is going away, so turn this on always. 651 // TODO(danakj): Fixed layout mode is going away, so turn this on always.
652 prefs.apply_default_device_scale_factor_in_compositor = true; 652 prefs.apply_default_device_scale_factor_in_compositor = true;
653 } 653 }
654 654
655 prefs.apply_page_scale_factor_in_compositor = 655 prefs.apply_page_scale_factor_in_compositor =
656 command_line.HasSwitch(cc::switches::kEnablePinchInCompositor); 656 command_line.HasSwitch(switches::kEnablePinch);
657 prefs.per_tile_painting_enabled = 657 prefs.per_tile_painting_enabled =
658 command_line.HasSwitch(cc::switches::kEnablePerTilePainting); 658 command_line.HasSwitch(cc::switches::kEnablePerTilePainting);
659 prefs.accelerated_animation_enabled = 659 prefs.accelerated_animation_enabled =
660 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); 660 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation);
661 661
662 prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch( 662 prefs.fixed_position_creates_stacking_context = !command_line.HasSwitch(
663 switches::kDisableFixedPositionCreatesStackingContext); 663 switches::kDisableFixedPositionCreatesStackingContext);
664 664
665 prefs.gesture_tap_highlight_enabled = command_line.HasSwitch( 665 prefs.gesture_tap_highlight_enabled = command_line.HasSwitch(
666 switches::kEnableGestureTapHighlight); 666 switches::kEnableGestureTapHighlight);
(...skipping 2692 matching lines...) Expand 10 before | Expand all | Expand 10 after
3359 3359
3360 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3360 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3361 return browser_plugin_guest_.get(); 3361 return browser_plugin_guest_.get();
3362 } 3362 }
3363 3363
3364 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3364 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3365 return browser_plugin_embedder_.get(); 3365 return browser_plugin_embedder_.get();
3366 } 3366 }
3367 3367
3368 } // namespace content 3368 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698