| 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 <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 void OnInputMethodChanged() override; | 258 void OnInputMethodChanged() override; |
| 259 bool ChangeTextDirectionAndLayoutAlignment( | 259 bool ChangeTextDirectionAndLayoutAlignment( |
| 260 base::i18n::TextDirection direction) override; | 260 base::i18n::TextDirection direction) override; |
| 261 void ExtendSelectionAndDelete(size_t before, size_t after) override; | 261 void ExtendSelectionAndDelete(size_t before, size_t after) override; |
| 262 void EnsureCaretInRect(const gfx::Rect& rect) override; | 262 void EnsureCaretInRect(const gfx::Rect& rect) override; |
| 263 void OnCandidateWindowShown() override; | 263 void OnCandidateWindowShown() override; |
| 264 void OnCandidateWindowUpdated() override; | 264 void OnCandidateWindowUpdated() override; |
| 265 void OnCandidateWindowHidden() override; | 265 void OnCandidateWindowHidden() override; |
| 266 bool IsEditingCommandEnabled(int command_id) override; | 266 bool IsEditingCommandEnabled(int command_id) override; |
| 267 void ExecuteEditingCommand(int command_id) override; | 267 void ExecuteEditingCommand(int command_id) override; |
| 268 void OnKeyboardBoundsUnchanged() override; |
| 268 | 269 |
| 269 // Overridden from gfx::DisplayObserver: | 270 // Overridden from gfx::DisplayObserver: |
| 270 void OnDisplayAdded(const gfx::Display& new_display) override; | 271 void OnDisplayAdded(const gfx::Display& new_display) override; |
| 271 void OnDisplayRemoved(const gfx::Display& old_display) override; | 272 void OnDisplayRemoved(const gfx::Display& old_display) override; |
| 272 void OnDisplayMetricsChanged(const gfx::Display& display, | 273 void OnDisplayMetricsChanged(const gfx::Display& display, |
| 273 uint32_t metrics) override; | 274 uint32_t metrics) override; |
| 274 | 275 |
| 275 // Overridden from aura::WindowDelegate: | 276 // Overridden from aura::WindowDelegate: |
| 276 gfx::Size GetMinimumSize() const override; | 277 gfx::Size GetMinimumSize() const override; |
| 277 gfx::Size GetMaximumSize() const override; | 278 gfx::Size GetMaximumSize() const override; |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 // compositing surface and showing the disambiguation popup. | 638 // compositing surface and showing the disambiguation popup. |
| 638 gfx::Vector2dF disambiguation_scroll_offset_; | 639 gfx::Vector2dF disambiguation_scroll_offset_; |
| 639 | 640 |
| 640 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 641 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 641 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 642 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 642 }; | 643 }; |
| 643 | 644 |
| 644 } // namespace content | 645 } // namespace content |
| 645 | 646 |
| 646 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 647 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |