diff options
| author | mfomitchev <mfomitchev@chromium.org> | 2014-09-02 07:03:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-02 14:05:53 +0000 |
| commit | 5ef7c0aff8c8e6c8328acfa4ee4ae0b0ccc33f36 (patch) | |
| tree | 0f65f1351c0d9977ae887f8b80b8aa6459bf296e /athena | |
| parent | 3d52a11f9d247d937c74983c32b95fac39456945 (diff) | |
| download | chromium_src-5ef7c0aff8c8e6c8328acfa4ee4ae0b0ccc33f36.zip chromium_src-5ef7c0aff8c8e6c8328acfa4ee4ae0b0ccc33f36.tar.gz chromium_src-5ef7c0aff8c8e6c8328acfa4ee4ae0b0ccc33f36.tar.bz2 | |
Enabling overscroll/GestureNav for Athena.
BUG=401604
Review URL: https://codereview.chromium.org/524623004
Cr-Commit-Position: refs/heads/master@{#292918}
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/content/web_activity.cc | 8 |
1 files changed, 8 insertions, 0 deletions
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, |