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

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

Issue 11308083: Fix the html select tag showing up at the wrong position. This was a regression from r166446. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win_rel Created 8 years, 1 month 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 24 matching lines...) Expand all
35 public RenderViewHostDelegateView, 35 public RenderViewHostDelegateView,
36 NON_EXPORTED_BASE(public OverscrollControllerDelegate), 36 NON_EXPORTED_BASE(public OverscrollControllerDelegate),
37 public ui::ImplicitAnimationObserver, 37 public ui::ImplicitAnimationObserver,
38 public aura::WindowDelegate, 38 public aura::WindowDelegate,
39 public aura::client::DragDropDelegate { 39 public aura::client::DragDropDelegate {
40 public: 40 public:
41 WebContentsViewAura(WebContentsImpl* web_contents, 41 WebContentsViewAura(WebContentsImpl* web_contents,
42 WebContentsViewDelegate* delegate); 42 WebContentsViewDelegate* delegate);
43 43
44 private: 44 private:
45 class WindowObserver;
46
45 virtual ~WebContentsViewAura(); 47 virtual ~WebContentsViewAura();
46 48
47 void SizeChangedCommon(const gfx::Size& size); 49 void SizeChangedCommon(const gfx::Size& size);
48 50
49 void EndDrag(WebKit::WebDragOperationsMask ops); 51 void EndDrag(WebKit::WebDragOperationsMask ops);
50 52
51 // Creates and sets up the overlay window that will be displayed during the 53 // Creates and sets up the overlay window that will be displayed during the
52 // overscroll gesture. 54 // overscroll gesture.
53 void PrepareOverscrollWindow(); 55 void PrepareOverscrollWindow();
54 56
(...skipping 17 matching lines...) Expand all
72 aura::Window* GetWindowToAnimateForOverscroll(); 74 aura::Window* GetWindowToAnimateForOverscroll();
73 75
74 // Returns the amount the animating window should be translated in response to 76 // Returns the amount the animating window should be translated in response to
75 // the overscroll gesture. 77 // the overscroll gesture.
76 gfx::Vector2d GetTranslationForOverscroll(int delta_x, int delta_y); 78 gfx::Vector2d GetTranslationForOverscroll(int delta_x, int delta_y);
77 79
78 // Overridden from WebContentsView: 80 // Overridden from WebContentsView:
79 virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; 81 virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
80 virtual RenderWidgetHostView* CreateViewForWidget( 82 virtual RenderWidgetHostView* CreateViewForWidget(
81 RenderWidgetHost* render_widget_host) OVERRIDE; 83 RenderWidgetHost* render_widget_host) OVERRIDE;
84 virtual void SetView(RenderWidgetHostView* view) OVERRIDE;
82 virtual gfx::NativeView GetNativeView() const OVERRIDE; 85 virtual gfx::NativeView GetNativeView() const OVERRIDE;
83 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 86 virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
84 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 87 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
85 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; 88 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
86 virtual void SetPageTitle(const string16& title) OVERRIDE; 89 virtual void SetPageTitle(const string16& title) OVERRIDE;
87 virtual void OnTabCrashed(base::TerminationStatus status, 90 virtual void OnTabCrashed(base::TerminationStatus status,
88 int error_code) OVERRIDE; 91 int error_code) OVERRIDE;
89 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 92 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
90 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; 93 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
91 virtual void Focus() OVERRIDE; 94 virtual void Focus() OVERRIDE;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 159
157 // Overridden from aura::client::DragDropDelegate: 160 // Overridden from aura::client::DragDropDelegate:
158 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 161 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
159 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 162 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
160 virtual void OnDragExited() OVERRIDE; 163 virtual void OnDragExited() OVERRIDE;
161 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 164 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
162 165
163 scoped_ptr<aura::Window> window_; 166 scoped_ptr<aura::Window> window_;
164 scoped_ptr<aura::Window> overscroll_window_; 167 scoped_ptr<aura::Window> overscroll_window_;
165 168
169 scoped_ptr<WindowObserver> window_observer_;
170
166 // The WebContentsImpl whose contents we display. 171 // The WebContentsImpl whose contents we display.
167 WebContentsImpl* web_contents_; 172 WebContentsImpl* web_contents_;
168 173
169 RenderWidgetHostView* view_; 174 RenderWidgetHostView* view_;
170 175
171 scoped_ptr<WebContentsViewDelegate> delegate_; 176 scoped_ptr<WebContentsViewDelegate> delegate_;
172 177
173 WebKit::WebDragOperationsMask current_drag_op_; 178 WebKit::WebDragOperationsMask current_drag_op_;
174 179
175 scoped_ptr<WebDropData> current_drop_data_; 180 scoped_ptr<WebDropData> current_drop_data_;
(...skipping 12 matching lines...) Expand all
188 // This is the completed overscroll gesture. This is used for the animation 193 // This is the completed overscroll gesture. This is used for the animation
189 // callback that happens in response to a completed overscroll gesture. 194 // callback that happens in response to a completed overscroll gesture.
190 OverscrollMode completed_overscroll_gesture_; 195 OverscrollMode completed_overscroll_gesture_;
191 196
192 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 197 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
193 }; 198 };
194 199
195 } // namespace content 200 } // namespace content
196 201
197 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 202 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698