OLD | NEW |
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_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 virtual void OnInputMethodChanged() OVERRIDE; | 152 virtual void OnInputMethodChanged() OVERRIDE; |
153 virtual bool ChangeTextDirectionAndLayoutAlignment( | 153 virtual bool ChangeTextDirectionAndLayoutAlignment( |
154 base::i18n::TextDirection direction) OVERRIDE; | 154 base::i18n::TextDirection direction) OVERRIDE; |
155 | 155 |
156 // Overridden from aura::WindowDelegate: | 156 // Overridden from aura::WindowDelegate: |
157 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 157 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
158 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 158 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
159 const gfx::Rect& new_bounds) OVERRIDE; | 159 const gfx::Rect& new_bounds) OVERRIDE; |
160 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; | 160 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
161 virtual void OnBlur() OVERRIDE; | 161 virtual void OnBlur() OVERRIDE; |
162 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; | 162 virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE; |
163 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 163 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
164 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 164 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
165 virtual bool ShouldDescendIntoChildForEventHandling( | 165 virtual bool ShouldDescendIntoChildForEventHandling( |
166 aura::Window* child, | 166 aura::Window* child, |
167 const gfx::Point& location) OVERRIDE; | 167 const gfx::Point& location) OVERRIDE; |
168 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 168 virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
169 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 169 virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) OVERRIDE; |
170 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; | 170 virtual ui::GestureStatus OnGestureEvent( |
| 171 ui::GestureEventImpl* event) OVERRIDE; |
171 virtual bool CanFocus() OVERRIDE; | 172 virtual bool CanFocus() OVERRIDE; |
172 virtual void OnCaptureLost() OVERRIDE; | 173 virtual void OnCaptureLost() OVERRIDE; |
173 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 174 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
174 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; | 175 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
175 virtual void OnWindowDestroying() OVERRIDE; | 176 virtual void OnWindowDestroying() OVERRIDE; |
176 virtual void OnWindowDestroyed() OVERRIDE; | 177 virtual void OnWindowDestroyed() OVERRIDE; |
177 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; | 178 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; |
178 virtual bool HasHitTestMask() const OVERRIDE; | 179 virtual bool HasHitTestMask() const OVERRIDE; |
179 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; | 180 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; |
180 | 181 |
181 // Overridden from aura::client::ActivationDelegate: | 182 // Overridden from aura::client::ActivationDelegate: |
182 virtual bool ShouldActivate(const aura::Event* event) OVERRIDE; | 183 virtual bool ShouldActivate(const ui::Event* event) OVERRIDE; |
183 virtual void OnActivated() OVERRIDE; | 184 virtual void OnActivated() OVERRIDE; |
184 virtual void OnLostActive() OVERRIDE; | 185 virtual void OnLostActive() OVERRIDE; |
185 | 186 |
186 protected: | 187 protected: |
187 friend class RenderWidgetHostView; | 188 friend class RenderWidgetHostView; |
188 | 189 |
189 // Should construct only via RenderWidgetHostView::CreateViewForWidget. | 190 // Should construct only via RenderWidgetHostView::CreateViewForWidget. |
190 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); | 191 explicit RenderWidgetHostViewAura(RenderWidgetHost* host); |
191 | 192 |
192 private: | 193 private: |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 | 374 |
374 // This lock is for waiting for a front surface to become available to draw. | 375 // This lock is for waiting for a front surface to become available to draw. |
375 scoped_refptr<aura::CompositorLock> released_front_lock_; | 376 scoped_refptr<aura::CompositorLock> released_front_lock_; |
376 | 377 |
377 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 378 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
378 }; | 379 }; |
379 | 380 |
380 } // namespace content | 381 } // namespace content |
381 | 382 |
382 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 383 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |