diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 13:54:03 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 13:54:03 +0000 |
| commit | cac23aa93596b72e851f4d9ca4d008e909150297 (patch) | |
| tree | 058ab36df6bd690c2a9face2c469582f28a6f88d | |
| parent | 5d02116b3ebce0bde353ab355b5ce51d61c1b7d6 (diff) | |
| download | chromium_src-cac23aa93596b72e851f4d9ca4d008e909150297.zip chromium_src-cac23aa93596b72e851f4d9ca4d008e909150297.tar.gz chromium_src-cac23aa93596b72e851f4d9ca4d008e909150297.tar.bz2 | |
Re-enable gesture nav.
This is a revert of crrev.com/203791
TBR=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/16747004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205536 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index c398092c..f0988ee 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -1138,7 +1138,7 @@ void Browser::TabStripEmpty() { bool Browser::CanOverscrollContent() const { #if defined(USE_AURA) bool overscroll_enabled = CommandLine::ForCurrentProcess()-> - GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1"; + GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0"; if (!overscroll_enabled) return false; if (is_app() || is_devtools() || !is_type_tabbed()) diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 9e0a2e1..d3b84c9 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -211,7 +211,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate, #if defined(USE_AURA) bool overscroll_enabled = CommandLine::ForCurrentProcess()-> - GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1"; + GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0"; SetOverscrollControllerEnabled(overscroll_enabled); #endif } diff --git a/content/browser/web_contents/web_contents_screenshot_manager.cc b/content/browser/web_contents/web_contents_screenshot_manager.cc index 8174e3a..49cb0c6 100644 --- a/content/browser/web_contents/web_contents_screenshot_manager.cc +++ b/content/browser/web_contents/web_contents_screenshot_manager.cc @@ -71,7 +71,7 @@ WebContentsScreenshotManager::~WebContentsScreenshotManager() { void WebContentsScreenshotManager::TakeScreenshot() { static bool overscroll_enabled = CommandLine::ForCurrentProcess()-> - GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1"; + GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0"; if (!overscroll_enabled) return; diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 0b219f6..ba69ddf 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -86,11 +86,6 @@ class WebContentsViewAuraTest : public ContentBrowserTest { : screenshot_manager_(NULL) { } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { - command_line->AppendSwitchASCII(switches::kOverscrollHistoryNavigation, - std::string("1")); - } - // Executes the javascript synchronously and makes sure the returned value is // freed properly. void ExecuteSyncJSFunction(RenderViewHost* rvh, const std::string& jscript) { |