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

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: Created 4 years, 8 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 25 matching lines...) Expand all
36 #include "ui/aura/window_delegate.h" 36 #include "ui/aura/window_delegate.h"
37 #include "ui/aura/window_tree_host_observer.h" 37 #include "ui/aura/window_tree_host_observer.h"
38 #include "ui/base/ime/text_input_client.h" 38 #include "ui/base/ime/text_input_client.h"
39 #include "ui/base/touch/selection_bound.h" 39 #include "ui/base/touch/selection_bound.h"
40 #include "ui/events/gestures/motion_event_aura.h" 40 #include "ui/events/gestures/motion_event_aura.h"
41 #include "ui/gfx/display_observer.h" 41 #include "ui/gfx/display_observer.h"
42 #include "ui/gfx/geometry/insets.h" 42 #include "ui/gfx/geometry/insets.h"
43 #include "ui/gfx/geometry/rect.h" 43 #include "ui/gfx/geometry/rect.h"
44 #include "ui/wm/public/activation_delegate.h" 44 #include "ui/wm/public/activation_delegate.h"
45 45
46 struct ViewHostMsg_TextInputState_Params; 46 struct TextInputState;
47 47
48 namespace aura { 48 namespace aura {
49 class WindowTracker; 49 class WindowTracker;
50 namespace client { 50 namespace client {
51 class ScopedTooltipDisabler; 51 class ScopedTooltipDisabler;
52 } 52 }
53 } 53 }
54 54
55 namespace cc { 55 namespace cc {
56 class CopyOutputRequest; 56 class CopyOutputRequest;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 gfx::Size GetVisibleViewportSize() const override; 129 gfx::Size GetVisibleViewportSize() const override;
130 void SetInsets(const gfx::Insets& insets) override; 130 void SetInsets(const gfx::Insets& insets) override;
131 131
132 // Overridden from RenderWidgetHostViewBase: 132 // Overridden from RenderWidgetHostViewBase:
133 void InitAsPopup(RenderWidgetHostView* parent_host_view, 133 void InitAsPopup(RenderWidgetHostView* parent_host_view,
134 const gfx::Rect& pos) override; 134 const gfx::Rect& pos) override;
135 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override; 135 void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
136 void Focus() override; 136 void Focus() override;
137 void UpdateCursor(const WebCursor& cursor) override; 137 void UpdateCursor(const WebCursor& cursor) override;
138 void SetIsLoading(bool is_loading) override; 138 void SetIsLoading(bool is_loading) override;
139 void TextInputStateChanged( 139 void TextInputStateChanged(const TextInputState& params) override;
140 const ViewHostMsg_TextInputState_Params& params) override;
141 void ImeCancelComposition() override; 140 void ImeCancelComposition() override;
142 void ImeCompositionRangeChanged( 141 void ImeCompositionRangeChanged(
143 const gfx::Range& range, 142 const gfx::Range& range,
144 const std::vector<gfx::Rect>& character_bounds) override; 143 const std::vector<gfx::Rect>& character_bounds) override;
145 void RenderProcessGone(base::TerminationStatus status, 144 void RenderProcessGone(base::TerminationStatus status,
146 int error_code) override; 145 int error_code) override;
147 void Destroy() override; 146 void Destroy() override;
148 void SetTooltipText(const base::string16& tooltip_text) override; 147 void SetTooltipText(const base::string16& tooltip_text) override;
149 void SelectionChanged(const base::string16& text, 148 void SelectionChanged(const base::string16& text,
150 size_t offset, 149 size_t offset,
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 bool disable_input_event_router_for_testing_; 687 bool disable_input_event_router_for_testing_;
689 688
690 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 689 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
691 690
692 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 691 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
693 }; 692 };
694 693
695 } // namespace content 694 } // namespace content
696 695
697 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 696 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698