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
marcosholgado · Jun 11, 2013 · cac23aa · cac23aa
1 parent 5d02116
commit cac23aa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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) {