Commit 9d751807 authored by pkotwicz's avatar pkotwicz Committed by Commit bot

Remove stub ScrollEndEffectController

BUG=426561
TEST=None

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

Cr-Commit-Position: refs/heads/master@{#301515}
parent 9b1bc207
...@@ -1197,10 +1197,6 @@ bool Browser::TabsNeedBeforeUnloadFired() { ...@@ -1197,10 +1197,6 @@ bool Browser::TabsNeedBeforeUnloadFired() {
return unload_controller_->TabsNeedBeforeUnloadFired(); return unload_controller_->TabsNeedBeforeUnloadFired();
} }
void Browser::OverscrollUpdate(float delta_y) {
window_->OverscrollUpdate(delta_y);
}
void Browser::ShowValidationMessage(content::WebContents* web_contents, void Browser::ShowValidationMessage(content::WebContents* web_contents,
const gfx::Rect& anchor_in_root_view, const gfx::Rect& anchor_in_root_view,
const base::string16& main_text, const base::string16& main_text,
......
...@@ -443,7 +443,6 @@ class Browser : public TabStripModelObserver, ...@@ -443,7 +443,6 @@ class Browser : public TabStripModelObserver,
void HandleKeyboardEvent( void HandleKeyboardEvent(
content::WebContents* source, content::WebContents* source,
const content::NativeWebKeyboardEvent& event) override; const content::NativeWebKeyboardEvent& event) override;
void OverscrollUpdate(float delta_y) override;
void ShowValidationMessage(content::WebContents* web_contents, void ShowValidationMessage(content::WebContents* web_contents,
const gfx::Rect& anchor_in_root_view, const gfx::Rect& anchor_in_root_view,
const base::string16& main_text, const base::string16& main_text,
......
...@@ -377,10 +377,6 @@ class BrowserWindow : public ui::BaseWindow { ...@@ -377,10 +377,6 @@ class BrowserWindow : public ui::BaseWindow {
virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
const signin::ManageAccountsParams& manage_accounts_params) = 0; const signin::ManageAccountsParams& manage_accounts_params) = 0;
// Invoked when the amount of vertical overscroll changes. |delta_y| is the
// amount of overscroll that has occured in the y-direction.
virtual void OverscrollUpdate(float delta_y) {}
// Returns the height inset for RenderView when detached bookmark bar is // Returns the height inset for RenderView when detached bookmark bar is
// shown. Invoked when a new RenderHostView is created for a non-NTP // shown. Invoked when a new RenderHostView is created for a non-NTP
// navigation entry and the bookmark bar is detached. // navigation entry and the bookmark bar is detached.
......
...@@ -399,9 +399,6 @@ BrowserView::BrowserView() ...@@ -399,9 +399,6 @@ BrowserView::BrowserView()
ticker_(0), ticker_(0),
#endif #endif
force_location_bar_focus_(false), force_location_bar_focus_(false),
#if defined(OS_CHROMEOS)
scroll_end_effect_controller_(ScrollEndEffectController::Create()),
#endif
activate_modal_dialog_factory_(this) { activate_modal_dialog_factory_(this) {
} }
...@@ -2438,11 +2435,6 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton( ...@@ -2438,11 +2435,6 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
} }
} }
void BrowserView::OverscrollUpdate(float delta_y) {
if (scroll_end_effect_controller_)
scroll_end_effect_controller_->OverscrollUpdate(delta_y);
}
int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() { int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED || if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED ||
!bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) { !bookmark_bar_view_.get() || !bookmark_bar_view_->IsDetached()) {
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_frame.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h" #include "chrome/browser/ui/views/frame/contents_web_view.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
#include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h"
#include "chrome/browser/ui/views/frame/web_contents_close_handler.h" #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
#include "chrome/browser/ui/views/load_complete_listener.h" #include "chrome/browser/ui/views/load_complete_listener.h"
#include "components/infobars/core/infobar_container.h" #include "components/infobars/core/infobar_container.h"
...@@ -363,7 +362,6 @@ class BrowserView : public BrowserWindow, ...@@ -363,7 +362,6 @@ class BrowserView : public BrowserWindow,
const gfx::Rect& rect) override; const gfx::Rect& rect) override;
virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode, virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
const signin::ManageAccountsParams& manage_accounts_params) override; const signin::ManageAccountsParams& manage_accounts_params) override;
virtual void OverscrollUpdate(float delta_y) override;
virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override; virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
virtual void ExecuteExtensionCommand( virtual void ExecuteExtensionCommand(
const extensions::Extension* extension, const extensions::Extension* extension,
...@@ -708,8 +706,6 @@ class BrowserView : public BrowserWindow, ...@@ -708,8 +706,6 @@ class BrowserView : public BrowserWindow,
scoped_ptr<ImmersiveModeController> immersive_mode_controller_; scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_; scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
......
// Copyright 2013 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.
#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_H_
#define CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_H_
#include "base/basictypes.h"
// The controller receives the raw y-deltas generated by the overscroll
// controller and is resonsible for converting them in to the scroll end
// effect. This effect occurs in the vertical overscroll case and is used to
// visually indicate to the user that they have reached the end of the content
// that they are scrolling.
class ScrollEndEffectController {
public:
ScrollEndEffectController() {}
virtual ~ScrollEndEffectController() {}
static ScrollEndEffectController* Create();
// Interface that allows vertical overscroll activies to be communicated to
// the controller.
virtual void OverscrollUpdate(float delta_y) = 0;
private:
DISALLOW_COPY_AND_ASSIGN(ScrollEndEffectController);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_H_
// Copyright 2013 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 "chrome/browser/ui/views/frame/scroll_end_effect_controller_ash.h"
ScrollEndEffectController* ScrollEndEffectController::Create() {
return new ScrollEndEffectControllerAsh();
}
ScrollEndEffectControllerAsh::ScrollEndEffectControllerAsh() {
}
ScrollEndEffectControllerAsh::~ScrollEndEffectControllerAsh() {
}
void ScrollEndEffectControllerAsh::OverscrollUpdate(float delta_y) {
// TODO(rharrison): Implement initial version of scroll end effect
}
// Copyright 2013 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.
#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_ASH_H_
#define CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_ASH_H_
#include "base/compiler_specific.h"
#include "chrome/browser/ui/views/frame/scroll_end_effect_controller.h"
class ScrollEndEffectControllerAsh : public ScrollEndEffectController {
public:
ScrollEndEffectControllerAsh();
virtual ~ScrollEndEffectControllerAsh();
// ScrollEndEffectController overides:
virtual void OverscrollUpdate(float delta_y) override;
private:
DISALLOW_COPY_AND_ASSIGN(ScrollEndEffectControllerAsh);
};
#endif // CHROME_BROWSER_UI_VIEWS_FRAME_SCROLL_END_EFFECT_CONTROLLER_ASH_H_
...@@ -2039,7 +2039,6 @@ ...@@ -2039,7 +2039,6 @@
'browser/ui/views/frame/opaque_browser_frame_view_linux.h', 'browser/ui/views/frame/opaque_browser_frame_view_linux.h',
'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc', 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc',
'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h', 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h',
'browser/ui/views/frame/scroll_end_effect_controller.h',
'browser/ui/views/frame/system_menu_insertion_delegate_win.cc', 'browser/ui/views/frame/system_menu_insertion_delegate_win.cc',
'browser/ui/views/frame/system_menu_insertion_delegate_win.h', 'browser/ui/views/frame/system_menu_insertion_delegate_win.h',
'browser/ui/views/frame/system_menu_model_builder.cc', 'browser/ui/views/frame/system_menu_model_builder.cc',
...@@ -2438,8 +2437,6 @@ ...@@ -2438,8 +2437,6 @@
'browser/ui/views/frame/browser_non_client_frame_view_ash.h', 'browser/ui/views/frame/browser_non_client_frame_view_ash.h',
'browser/ui/views/frame/immersive_mode_controller_ash.cc', 'browser/ui/views/frame/immersive_mode_controller_ash.cc',
'browser/ui/views/frame/immersive_mode_controller_ash.h', 'browser/ui/views/frame/immersive_mode_controller_ash.h',
'browser/ui/views/frame/scroll_end_effect_controller_ash.cc',
'browser/ui/views/frame/scroll_end_effect_controller_ash.h',
'browser/ui/views/tabs/window_finder_ash.cc', 'browser/ui/views/tabs/window_finder_ash.cc',
], ],
# Used when Ash is enabled but not Athena. # Used when Ash is enabled but not Athena.
......
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