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

Side by Side Diff: content/renderer/browser_plugin/browser_plugin.h

Issue 2333813002: Introduce WebInputMethodController to blink (Closed)
Patch Set: Moved ConfirmCompositionBehavior to WebInputMethodController Created 4 years, 3 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 5 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 6 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
7 7
8 #include "third_party/WebKit/public/web/WebPlugin.h" 8 #include "third_party/WebKit/public/web/WebPlugin.h"
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/sequenced_task_runner_helpers.h" 14 #include "base/sequenced_task_runner_helpers.h"
15 #include "content/renderer/mouse_lock_dispatcher.h" 15 #include "content/renderer/mouse_lock_dispatcher.h"
16 #include "content/renderer/render_view_impl.h" 16 #include "content/renderer/render_view_impl.h"
17 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" 17 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
18 #include "third_party/WebKit/public/web/WebDragStatus.h" 18 #include "third_party/WebKit/public/web/WebDragStatus.h"
19 #include "third_party/WebKit/public/web/WebInputMethodController.h"
19 #include "third_party/WebKit/public/web/WebNode.h" 20 #include "third_party/WebKit/public/web/WebNode.h"
20 #include "third_party/WebKit/public/web/WebWidget.h"
21 21
22 struct BrowserPluginHostMsg_ResizeGuest_Params; 22 struct BrowserPluginHostMsg_ResizeGuest_Params;
23 struct FrameMsg_BuffersSwapped_Params; 23 struct FrameMsg_BuffersSwapped_Params;
24 24
25 namespace cc { 25 namespace cc {
26 class SurfaceId; 26 class SurfaceId;
27 struct SurfaceSequence; 27 struct SurfaceSequence;
28 } 28 }
29 29
30 namespace content { 30 namespace content {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 bool executeEditCommand(const blink::WebString& name, 114 bool executeEditCommand(const blink::WebString& name,
115 const blink::WebString& value) override; 115 const blink::WebString& value) override;
116 bool setComposition( 116 bool setComposition(
117 const blink::WebString& text, 117 const blink::WebString& text,
118 const blink::WebVector<blink::WebCompositionUnderline>& underlines, 118 const blink::WebVector<blink::WebCompositionUnderline>& underlines,
119 int selectionStart, 119 int selectionStart,
120 int selectionEnd) override; 120 int selectionEnd) override;
121 bool commitText(const blink::WebString& text, 121 bool commitText(const blink::WebString& text,
122 int relative_cursor_pos) override; 122 int relative_cursor_pos) override;
123 bool finishComposingText( 123 bool finishComposingText(
124 blink::WebWidget::ConfirmCompositionBehavior selection_behavior) override; 124 blink::WebInputMethodController::ConfirmCompositionBehavior
125 selection_behavior) override;
125 126
126 void extendSelectionAndDelete(int before, int after) override; 127 void extendSelectionAndDelete(int before, int after) override;
127 128
128 // MouseLockDispatcher::LockTarget implementation. 129 // MouseLockDispatcher::LockTarget implementation.
129 void OnLockMouseACK(bool succeeded) override; 130 void OnLockMouseACK(bool succeeded) override;
130 void OnMouseLockLost() override; 131 void OnMouseLockLost() override;
131 bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override; 132 bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override;
132 133
133 private: 134 private:
134 friend class base::DeleteHelper<BrowserPlugin>; 135 friend class base::DeleteHelper<BrowserPlugin>;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might 205 // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might
205 // get called after BrowserPlugin has been destroyed. 206 // get called after BrowserPlugin has been destroyed.
206 base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_; 207 base::WeakPtrFactory<BrowserPlugin> weak_ptr_factory_;
207 208
208 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin); 209 DISALLOW_COPY_AND_ASSIGN(BrowserPlugin);
209 }; 210 };
210 211
211 } // namespace content 212 } // namespace content
212 213
213 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ 214 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698