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

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

Issue 1249013005: Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 4 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_BASE_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 #include "ui/gfx/display.h" 27 #include "ui/gfx/display.h"
28 #include "ui/gfx/geometry/rect.h" 28 #include "ui/gfx/geometry/rect.h"
29 #include "ui/gfx/native_widget_types.h" 29 #include "ui/gfx/native_widget_types.h"
30 #include "ui/gfx/range/range.h" 30 #include "ui/gfx/range/range.h"
31 #include "ui/surface/transport_dib.h" 31 #include "ui/surface/transport_dib.h"
32 32
33 class SkBitmap; 33 class SkBitmap;
34 34
35 struct AccessibilityHostMsg_EventParams; 35 struct AccessibilityHostMsg_EventParams;
36 struct ViewHostMsg_SelectionBounds_Params; 36 struct ViewHostMsg_SelectionBounds_Params;
37 struct ViewHostMsg_TextInputState_Params;
37 38
38 namespace media { 39 namespace media {
39 class VideoFrame; 40 class VideoFrame;
40 } 41 }
41 42
42 namespace blink { 43 namespace blink {
43 struct WebScreenInfo; 44 struct WebScreenInfo;
44 } 45 }
45 46
46 namespace content { 47 namespace content {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 // |scroll_offset| is the scroll offset of the render view. 201 // |scroll_offset| is the scroll offset of the render view.
201 virtual void MovePluginWindows( 202 virtual void MovePluginWindows(
202 const std::vector<WebPluginGeometry>& moves) = 0; 203 const std::vector<WebPluginGeometry>& moves) = 0;
203 204
204 // Sets the cursor to the one associated with the specified cursor_type 205 // Sets the cursor to the one associated with the specified cursor_type
205 virtual void UpdateCursor(const WebCursor& cursor) = 0; 206 virtual void UpdateCursor(const WebCursor& cursor) = 0;
206 207
207 // Indicates whether the page has finished loading. 208 // Indicates whether the page has finished loading.
208 virtual void SetIsLoading(bool is_loading) = 0; 209 virtual void SetIsLoading(bool is_loading) = 0;
209 210
210 // Updates the type of the input method attached to the view. 211 // Updates the state of the input method attached to the view.
211 virtual void TextInputTypeChanged(ui::TextInputType type, 212 virtual void TextInputStateChanged(
212 ui::TextInputMode mode, 213 const ViewHostMsg_TextInputState_Params& params) = 0;
213 bool can_compose_inline,
214 int flags) = 0;
215 214
216 // Cancel the ongoing composition of the input method attached to the view. 215 // Cancel the ongoing composition of the input method attached to the view.
217 virtual void ImeCancelComposition() = 0; 216 virtual void ImeCancelComposition() = 0;
218 217
219 // Notifies the View that the renderer has ceased to exist. 218 // Notifies the View that the renderer has ceased to exist.
220 virtual void RenderProcessGone(base::TerminationStatus status, 219 virtual void RenderProcessGone(base::TerminationStatus status,
221 int error_code) = 0; 220 int error_code) = 0;
222 221
223 // Notifies the View that the renderer's host has ceased to exist. 222 // Notifies the View that the renderer's host has ceased to exist.
224 // The default implementation of this is a no-op. This hack exists to fix 223 // The default implementation of this is a no-op. This hack exists to fix
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_; 415 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_;
417 416
418 base::WeakPtrFactory<RenderWidgetHostViewBase> weak_factory_; 417 base::WeakPtrFactory<RenderWidgetHostViewBase> weak_factory_;
419 418
420 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase); 419 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase);
421 }; 420 };
422 421
423 } // namespace content 422 } // namespace content
424 423
425 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 424 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698