Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 478023002: OverscrollController consumes scroll updates only during gesture-nav. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODO to clean up browsertest. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 blink::WebDragOperationsMask operations, 132 blink::WebDragOperationsMask operations,
133 const gfx::ImageSkia& image, 133 const gfx::ImageSkia& image,
134 const gfx::Vector2d& image_offset, 134 const gfx::Vector2d& image_offset,
135 const DragEventSourceInfo& event_info) OVERRIDE; 135 const DragEventSourceInfo& event_info) OVERRIDE;
136 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 136 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
137 virtual void GotFocus() OVERRIDE; 137 virtual void GotFocus() OVERRIDE;
138 virtual void TakeFocus(bool reverse) OVERRIDE; 138 virtual void TakeFocus(bool reverse) OVERRIDE;
139 139
140 // Overridden from OverscrollControllerDelegate: 140 // Overridden from OverscrollControllerDelegate:
141 virtual gfx::Rect GetVisibleBounds() const OVERRIDE; 141 virtual gfx::Rect GetVisibleBounds() const OVERRIDE;
142 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; 142 virtual bool OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE;
143 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; 143 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE;
144 virtual void OnOverscrollModeChange(OverscrollMode old_mode, 144 virtual void OnOverscrollModeChange(OverscrollMode old_mode,
145 OverscrollMode new_mode) OVERRIDE; 145 OverscrollMode new_mode) OVERRIDE;
146 146
147 // Overridden from ui::ImplicitAnimationObserver: 147 // Overridden from ui::ImplicitAnimationObserver:
148 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 148 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
149 149
150 // Overridden from aura::WindowDelegate: 150 // Overridden from aura::WindowDelegate:
151 virtual gfx::Size GetMinimumSize() const OVERRIDE; 151 virtual gfx::Size GetMinimumSize() const OVERRIDE;
152 virtual gfx::Size GetMaximumSize() const OVERRIDE; 152 virtual gfx::Size GetMaximumSize() const OVERRIDE;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // On Windows we can run into problems if resources get released within the 232 // On Windows we can run into problems if resources get released within the
233 // initialization phase while the content (and its dimensions) are not known. 233 // initialization phase while the content (and its dimensions) are not known.
234 bool is_or_was_visible_; 234 bool is_or_was_visible_;
235 235
236 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 236 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
237 }; 237 };
238 238
239 } // namespace content 239 } // namespace content
240 240
241 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 241 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698