From 5ef7c0aff8c8e6c8328acfa4ee4ae0b0ccc33f36 Mon Sep 17 00:00:00 2001 From: mfomitchev Date: Tue, 2 Sep 2014 07:03:06 -0700 Subject: Enabling overscroll/GestureNav for Athena. BUG=401604 Review URL: https://codereview.chromium.org/524623004 Cr-Commit-Position: refs/heads/master@{#292918} --- athena/content/web_activity.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc index cadf112..ee2a19b8 100644 --- a/athena/content/web_activity.cc +++ b/athena/content/web_activity.cc @@ -8,11 +8,13 @@ #include "athena/activity/public/activity_manager.h" #include "athena/input/public/accelerator_manager.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "content/public/common/content_switches.h" #include "ui/aura/window.h" #include "ui/compositor/closure_animation_observer.h" #include "ui/compositor/scoped_layer_animation_settings.h" @@ -231,6 +233,12 @@ class AthenaWebView : public views::WebView { return NULL; } + virtual bool CanOverscrollContent() const OVERRIDE { + const std::string value = CommandLine::ForCurrentProcess()-> + GetSwitchValueASCII(switches::kOverscrollHistoryNavigation); + return value != "0"; + } + virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, -- cgit v1.1