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

Unified Diff: content/renderer/render_widget.h

Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A todo comment is reworded to be more correct. Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index d48c336f73baaa23cbd4587c1778c05b497c42d6..fde82206d26c7f7c1c84a05b92433e243f7d5e21 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -18,9 +18,9 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/ime/text_input_type.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
@@ -278,7 +278,11 @@ class RenderWidget : public IPC::Channel::Listener,
// Override point to obtain that the current input method state and caret
// position.
- virtual WebKit::WebTextInputType GetTextInputType();
+ virtual ui::TextInputType GetTextInputType();
+
+ // Override point to obtain that the current input method state about
+ // composition text.
+ virtual bool CanComposeInline();
// Tells the renderer it does not have focus. Used to prevent us from getting
// the focus on our own when the browser did not focus us.
@@ -397,7 +401,10 @@ class RenderWidget : public IPC::Channel::Listener,
bool input_method_is_active_;
// Stores the current text input type of |webwidget_|.
- WebKit::WebTextInputType text_input_type_;
+ ui::TextInputType text_input_type_;
+
+ // Stores the current type of composition text rendering of |webwidget_|.
+ bool can_compose_inline_;
// Stores the current caret bounds of input focus.
WebKit::WebRect caret_bounds_;
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698