Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 1914603002: Replace ViewHostMsg_TextInputState_Params with content::TextInputState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing Comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 26 matching lines...) Expand all
37 #include "ui/aura/window_tracker.h" 37 #include "ui/aura/window_tracker.h"
38 #include "ui/aura/window_tree_host_observer.h" 38 #include "ui/aura/window_tree_host_observer.h"
39 #include "ui/base/ime/text_input_client.h" 39 #include "ui/base/ime/text_input_client.h"
40 #include "ui/base/touch/selection_bound.h" 40 #include "ui/base/touch/selection_bound.h"
41 #include "ui/events/gestures/motion_event_aura.h" 41 #include "ui/events/gestures/motion_event_aura.h"
42 #include "ui/gfx/display_observer.h" 42 #include "ui/gfx/display_observer.h"
43 #include "ui/gfx/geometry/insets.h" 43 #include "ui/gfx/geometry/insets.h"
44 #include "ui/gfx/geometry/rect.h" 44 #include "ui/gfx/geometry/rect.h"
45 #include "ui/wm/public/activation_delegate.h" 45 #include "ui/wm/public/activation_delegate.h"
46 46
47 struct ViewHostMsg_TextInputState_Params;
48
49 namespace aura { 47 namespace aura {
50 namespace client { 48 namespace client {
51 class ScopedTooltipDisabler; 49 class ScopedTooltipDisabler;
52 } 50 }
53 } 51 }
54 52
55 namespace cc { 53 namespace cc {
56 class CopyOutputRequest; 54 class CopyOutputRequest;
57 class CopyOutputResult; 55 class CopyOutputResult;
58 class DelegatedFrameData; 56 class DelegatedFrameData;
(...skipping 21 matching lines...) Expand all
80 #if defined(OS_WIN) 78 #if defined(OS_WIN)
81 class LegacyRenderWidgetHostHWND; 79 class LegacyRenderWidgetHostHWND;
82 #endif 80 #endif
83 81
84 class OverscrollController; 82 class OverscrollController;
85 class RenderFrameHostImpl; 83 class RenderFrameHostImpl;
86 class RenderViewHostDelegateView; 84 class RenderViewHostDelegateView;
87 class RenderWidgetHostImpl; 85 class RenderWidgetHostImpl;
88 class RenderWidgetHostView; 86 class RenderWidgetHostView;
89 class TouchSelectionControllerClientAura; 87 class TouchSelectionControllerClientAura;
88 struct TextInputState;
90 89
91 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h. 90 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
92 class CONTENT_EXPORT RenderWidgetHostViewAura 91 class CONTENT_EXPORT RenderWidgetHostViewAura
93 : public RenderWidgetHostViewBase, 92 : public RenderWidgetHostViewBase,
94 public DelegatedFrameHostClient, 93 public DelegatedFrameHostClient,
95 public ui::TextInputClient, 94 public ui::TextInputClient,
96 public gfx::DisplayObserver, 95 public gfx::DisplayObserver,
97 public aura::WindowTreeHostObserver, 96 public aura::WindowTreeHostObserver,
98 public aura::WindowDelegate, 97 public aura::WindowDelegate,
99 public aura::client::ActivationDelegate, 98 public aura::client::ActivationDelegate,
(...skipping 29 matching lines...) Expand all
129 gfx::Size GetVisibleViewportSize() const override; 128 gfx::Size GetVisibleViewportSize() const override;
130 void SetInsets(const gfx::Insets& insets) override; 129 void SetInsets(const gfx::Insets& insets) override;
131 130
132 // Overridden from RenderWidgetHostViewBase: 131 // Overridden from RenderWidgetHostViewBase:
133 void InitAsPopup(RenderWidgetHostView* parent_host_view, 132 void InitAsPopup(RenderWidgetHostView* parent_host_view,
134 const gfx::Rect& pos) override; 133 const gfx::Rect& pos) override;
135 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; 134 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
136 void Focus() override; 135 void Focus() override;
137 void UpdateCursor(const WebCursor& cursor) override; 136 void UpdateCursor(const WebCursor& cursor) override;
138 void SetIsLoading(bool is_loading) override; 137 void SetIsLoading(bool is_loading) override;
139 void TextInputStateChanged( 138 void TextInputStateChanged(const TextInputState& params) override;
140 const ViewHostMsg_TextInputState_Params& params) override;
141 void ImeCancelComposition() override; 139 void ImeCancelComposition() override;
142 void ImeCompositionRangeChanged( 140 void ImeCompositionRangeChanged(
143 const gfx::Range& range, 141 const gfx::Range& range,
144 const std::vector<gfx::Rect>& character_bounds) override; 142 const std::vector<gfx::Rect>& character_bounds) override;
145 void RenderProcessGone(base::TerminationStatus status, 143 void RenderProcessGone(base::TerminationStatus status,
146 int error_code) override; 144 int error_code) override;
147 void Destroy() override; 145 void Destroy() override;
148 void SetTooltipText(const base::string16& tooltip_text) override; 146 void SetTooltipText(const base::string16& tooltip_text) override;
149 void SelectionChanged(const base::string16& text, 147 void SelectionChanged(const base::string16& text,
150 size_t offset, 148 size_t offset,
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 bool disable_input_event_router_for_testing_; 686 bool disable_input_event_router_for_testing_;
689 687
690 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 688 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
691 689
692 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 690 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
693 }; 691 };
694 692
695 } // namespace content 693 } // namespace content
696 694
697 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 695 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698