| 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 #include <vector> | 10 #include <vector> |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 virtual bool GetTextFromRange(const ui::Range& range, | 151 virtual bool GetTextFromRange(const ui::Range& range, |
| 152 string16* text) OVERRIDE; | 152 string16* text) OVERRIDE; |
| 153 virtual void OnInputMethodChanged() OVERRIDE; | 153 virtual void OnInputMethodChanged() OVERRIDE; |
| 154 virtual bool ChangeTextDirectionAndLayoutAlignment( | 154 virtual bool ChangeTextDirectionAndLayoutAlignment( |
| 155 base::i18n::TextDirection direction) OVERRIDE; | 155 base::i18n::TextDirection direction) OVERRIDE; |
| 156 | 156 |
| 157 // Overridden from aura::WindowDelegate: | 157 // Overridden from aura::WindowDelegate: |
| 158 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 158 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 159 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 159 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 160 const gfx::Rect& new_bounds) OVERRIDE; | 160 const gfx::Rect& new_bounds) OVERRIDE; |
| 161 virtual void OnFocus() OVERRIDE; | 161 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
| 162 virtual void OnBlur() OVERRIDE; | 162 virtual void OnBlur() OVERRIDE; |
| 163 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; | 163 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; |
| 164 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 164 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 165 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 165 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 166 virtual bool ShouldDescendIntoChildForEventHandling( | 166 virtual bool ShouldDescendIntoChildForEventHandling( |
| 167 aura::Window* child, | 167 aura::Window* child, |
| 168 const gfx::Point& location) OVERRIDE; | 168 const gfx::Point& location) OVERRIDE; |
| 169 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 169 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
| 170 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 170 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
| 171 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; | 171 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 // These locks are the ones waiting for a frame to be drawn. | 326 // These locks are the ones waiting for a frame to be drawn. |
| 327 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 327 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 328 | 328 |
| 329 // This lock is for waiting for a front surface to become available to draw. | 329 // This lock is for waiting for a front surface to become available to draw. |
| 330 scoped_refptr<aura::CompositorLock> released_front_lock_; | 330 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 331 | 331 |
| 332 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 332 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 333 }; | 333 }; |
| 334 | 334 |
| 335 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 335 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |