Enabling overscroll/GestureNav for Athena.

athena/content/web_activity.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/input/public/accelerator_manager.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/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
+
+

[sadrul, 2014/08/29 19:36:54]

Remove blank lines.

[mfomitchev, 2014/08/29 19:45:16]

Done.

 namespace athena {
 namespace {
 
 class WebActivityController : public AcceleratorHandler {
  public:
   enum Command {
     CMD_BACK,
     CMD_FORWARD,
     CMD_RELOAD,
     CMD_RELOAD_IGNORE_CACHE,
@@ skipping 183 matching lines @@
                                                       params.url));
         break;
       }
       default:
         break;
     }
     // NULL is returned if the URL wasn't opened immediately.
     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,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE {
     ActivityManager::Get()->AddActivity(
         new WebActivity(new AthenaWebView(new_contents)));
   }
 
@@ skipping 174 matching lines @@
 void WebActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
 }
 
 }  // namespace athena