| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 143 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 144 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 144 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 145 const gfx::Rect& new_bounds) OVERRIDE; | 145 const gfx::Rect& new_bounds) OVERRIDE; |
| 146 virtual void OnFocus() OVERRIDE; | 146 virtual void OnFocus() OVERRIDE; |
| 147 virtual void OnBlur() OVERRIDE; | 147 virtual void OnBlur() OVERRIDE; |
| 148 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; | 148 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; |
| 149 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 149 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 150 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 150 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 151 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 151 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
| 152 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 152 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
| 153 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; |
| 153 virtual bool CanFocus() OVERRIDE; | 154 virtual bool CanFocus() OVERRIDE; |
| 154 virtual void OnCaptureLost() OVERRIDE; | 155 virtual void OnCaptureLost() OVERRIDE; |
| 155 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 156 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| 156 virtual void OnWindowDestroying() OVERRIDE; | 157 virtual void OnWindowDestroying() OVERRIDE; |
| 157 virtual void OnWindowDestroyed() OVERRIDE; | 158 virtual void OnWindowDestroyed() OVERRIDE; |
| 158 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; | 159 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; |
| 159 | 160 |
| 160 // Overridden from aura::client::ActivationDelegate: | 161 // Overridden from aura::client::ActivationDelegate: |
| 161 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; | 162 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; |
| 162 virtual void OnActivated() OVERRIDE; | 163 virtual void OnActivated() OVERRIDE; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 gfx::PluginWindowHandle current_surface_; | 229 gfx::PluginWindowHandle current_surface_; |
| 229 #endif | 230 #endif |
| 230 | 231 |
| 231 // If non-NULL we're in OnPaint() and this is the supplied canvas. | 232 // If non-NULL we're in OnPaint() and this is the supplied canvas. |
| 232 gfx::Canvas* paint_canvas_; | 233 gfx::Canvas* paint_canvas_; |
| 233 | 234 |
| 234 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 235 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 235 }; | 236 }; |
| 236 | 237 |
| 237 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 238 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |