Commit b4c6ace9 authored by sadrul@chromium.org's avatar sadrul@chromium.org

gesture nav: Disable for M28.

BUG=244567
R=sky@chromium.org

Review URL: https://codereview.chromium.org/16335006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203791 0039d316-1c4b-4281-b951-d872f2087c98
parent 910ecfeb
......@@ -1127,7 +1127,7 @@ void Browser::TabStripEmpty() {
bool Browser::CanOverscrollContent() const {
#if defined(USE_AURA)
bool overscroll_enabled = CommandLine::ForCurrentProcess()->
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1";
if (!overscroll_enabled)
return false;
if (is_app() || is_devtools() || !is_type_tabbed())
......
......@@ -209,7 +209,7 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
#if defined(USE_AURA)
bool overscroll_enabled = CommandLine::ForCurrentProcess()->
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1";
SetOverscrollControllerEnabled(overscroll_enabled);
#endif
}
......
......@@ -71,7 +71,7 @@ WebContentsScreenshotManager::~WebContentsScreenshotManager() {
void WebContentsScreenshotManager::TakeScreenshot() {
static bool overscroll_enabled = CommandLine::ForCurrentProcess()->
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) == "1";
if (!overscroll_enabled)
return;
......
......@@ -86,6 +86,11 @@ 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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment