| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 virtual bool GetTextRange(ui::Range* range) OVERRIDE; | 149 virtual bool GetTextRange(ui::Range* range) OVERRIDE; |
| 150 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE; | 150 virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE; |
| 151 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE; | 151 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE; |
| 152 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE; | 152 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE; |
| 153 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; | 153 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; |
| 154 virtual bool GetTextFromRange(const ui::Range& range, | 154 virtual bool GetTextFromRange(const ui::Range& range, |
| 155 string16* text) OVERRIDE; | 155 string16* text) OVERRIDE; |
| 156 virtual void OnInputMethodChanged() OVERRIDE; | 156 virtual void OnInputMethodChanged() OVERRIDE; |
| 157 virtual bool ChangeTextDirectionAndLayoutAlignment( | 157 virtual bool ChangeTextDirectionAndLayoutAlignment( |
| 158 base::i18n::TextDirection direction) OVERRIDE; | 158 base::i18n::TextDirection direction) OVERRIDE; |
| 159 virtual void ExtendSelectionAndDelete(int before, int after) OVERRIDE; |
| 159 | 160 |
| 160 // Overridden from aura::WindowDelegate: | 161 // Overridden from aura::WindowDelegate: |
| 161 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 162 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 162 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 163 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 163 const gfx::Rect& new_bounds) OVERRIDE; | 164 const gfx::Rect& new_bounds) OVERRIDE; |
| 164 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; | 165 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
| 165 virtual void OnBlur() OVERRIDE; | 166 virtual void OnBlur() OVERRIDE; |
| 166 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 167 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 167 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 168 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 168 virtual bool ShouldDescendIntoChildForEventHandling( | 169 virtual bool ShouldDescendIntoChildForEventHandling( |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 381 |
| 381 // This lock is for waiting for a front surface to become available to draw. | 382 // This lock is for waiting for a front surface to become available to draw. |
| 382 scoped_refptr<aura::CompositorLock> released_front_lock_; | 383 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 383 | 384 |
| 384 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 385 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 385 }; | 386 }; |
| 386 | 387 |
| 387 } // namespace content | 388 } // namespace content |
| 388 | 389 |
| 389 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 390 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |