| 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 bool GetSelectionRange(gfx::Range* range) const override; | 254 bool GetSelectionRange(gfx::Range* range) const override; |
| 255 bool SetSelectionRange(const gfx::Range& range) override; | 255 bool SetSelectionRange(const gfx::Range& range) override; |
| 256 bool DeleteRange(const gfx::Range& range) override; | 256 bool DeleteRange(const gfx::Range& range) override; |
| 257 bool GetTextFromRange(const gfx::Range& range, | 257 bool GetTextFromRange(const gfx::Range& range, |
| 258 base::string16* text) const override; | 258 base::string16* text) const override; |
| 259 void OnInputMethodChanged() override; | 259 void OnInputMethodChanged() override; |
| 260 bool ChangeTextDirectionAndLayoutAlignment( | 260 bool ChangeTextDirectionAndLayoutAlignment( |
| 261 base::i18n::TextDirection direction) override; | 261 base::i18n::TextDirection direction) override; |
| 262 void ExtendSelectionAndDelete(size_t before, size_t after) override; | 262 void ExtendSelectionAndDelete(size_t before, size_t after) override; |
| 263 void EnsureCaretInRect(const gfx::Rect& rect) override; | 263 void EnsureCaretInRect(const gfx::Rect& rect) override; |
| 264 void OnCandidateWindowShown() override; | |
| 265 void OnCandidateWindowUpdated() override; | |
| 266 void OnCandidateWindowHidden() override; | |
| 267 bool IsEditCommandEnabled(int command_id) override; | 264 bool IsEditCommandEnabled(int command_id) override; |
| 268 void SetEditCommandForNextKeyEvent(int command_id) override; | 265 void SetEditCommandForNextKeyEvent(int command_id) override; |
| 269 | 266 |
| 270 // Overridden from gfx::DisplayObserver: | 267 // Overridden from gfx::DisplayObserver: |
| 271 void OnDisplayAdded(const gfx::Display& new_display) override; | 268 void OnDisplayAdded(const gfx::Display& new_display) override; |
| 272 void OnDisplayRemoved(const gfx::Display& old_display) override; | 269 void OnDisplayRemoved(const gfx::Display& old_display) override; |
| 273 void OnDisplayMetricsChanged(const gfx::Display& display, | 270 void OnDisplayMetricsChanged(const gfx::Display& display, |
| 274 uint32_t metrics) override; | 271 uint32_t metrics) override; |
| 275 | 272 |
| 276 // Overridden from aura::WindowDelegate: | 273 // Overridden from aura::WindowDelegate: |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 | 675 |
| 679 BeginFrameObserverProxy begin_frame_observer_proxy_; | 676 BeginFrameObserverProxy begin_frame_observer_proxy_; |
| 680 | 677 |
| 681 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; | 678 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; |
| 682 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 679 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 683 }; | 680 }; |
| 684 | 681 |
| 685 } // namespace content | 682 } // namespace content |
| 686 | 683 |
| 687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 684 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |