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

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

Issue 12346002: overscroll: Fix an issue where the overscroll window could get stuck. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-tests Created 7 years, 9 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
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 25 matching lines...) Expand all
36 : public WebContentsViewPort, 36 : public WebContentsViewPort,
37 public RenderViewHostDelegateView, 37 public RenderViewHostDelegateView,
38 NON_EXPORTED_BASE(public OverscrollControllerDelegate), 38 NON_EXPORTED_BASE(public OverscrollControllerDelegate),
39 public ui::ImplicitAnimationObserver, 39 public ui::ImplicitAnimationObserver,
40 public aura::WindowDelegate, 40 public aura::WindowDelegate,
41 public aura::client::DragDropDelegate { 41 public aura::client::DragDropDelegate {
42 public: 42 public:
43 WebContentsViewAura(WebContentsImpl* web_contents, 43 WebContentsViewAura(WebContentsImpl* web_contents,
44 WebContentsViewDelegate* delegate); 44 WebContentsViewDelegate* delegate);
45 45
46 void SetupOverlayWindowForTesting();
47
46 private: 48 private:
47 class WindowObserver; 49 class WindowObserver;
48 #if defined(OS_WIN) 50 #if defined(OS_WIN)
49 class ChildWindowObserver; 51 class ChildWindowObserver;
50 #endif 52 #endif
51 53
52 virtual ~WebContentsViewAura(); 54 virtual ~WebContentsViewAura();
53 55
54 void SizeChangedCommon(const gfx::Size& size); 56 void SizeChangedCommon(const gfx::Size& size);
55 57
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // This manages the overlay window that shows the screenshot during a history 222 // This manages the overlay window that shows the screenshot during a history
221 // navigation triggered by the overscroll gesture. 223 // navigation triggered by the overscroll gesture.
222 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; 224 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_;
223 225
224 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 226 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
225 }; 227 };
226 228
227 } // namespace content 229 } // namespace content
228 230
229 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 231 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698