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

Side by Side Diff: content/browser/renderer_host/render_widget_host.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/process_util.h" 15 #include "base/process_util.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "base/timer.h" 17 #include "base/timer.h"
18 #include "content/common/native_web_keyboard_event.h" 18 #include "content/common/native_web_keyboard_event.h"
19 #include "content/common/property_bag.h" 19 #include "content/common/property_bag.h"
20 #include "ipc/ipc_channel.h" 20 #include "ipc/ipc_channel.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h" 23 #include "ui/base/ime/text_input_type.h"
24 #include "ui/gfx/native_widget_types.h" 24 #include "ui/gfx/native_widget_types.h"
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
26 #include "ui/gfx/size.h" 26 #include "ui/gfx/size.h"
27 #include "ui/gfx/surface/transport_dib.h" 27 #include "ui/gfx/surface/transport_dib.h"
28 28
29 namespace gfx { 29 namespace gfx {
30 class Rect; 30 class Rect;
31 } 31 }
32 32
33 namespace ui { 33 namespace ui {
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 void OnMsgRequestMove(const gfx::Rect& pos); 448 void OnMsgRequestMove(const gfx::Rect& pos);
449 void OnMsgSetTooltipText(const std::wstring& tooltip_text, 449 void OnMsgSetTooltipText(const std::wstring& tooltip_text,
450 WebKit::WebTextDirection text_direction_hint); 450 WebKit::WebTextDirection text_direction_hint);
451 void OnMsgPaintAtSizeAck(int tag, const gfx::Size& size); 451 void OnMsgPaintAtSizeAck(int tag, const gfx::Size& size);
452 void OnMsgUpdateRect(const ViewHostMsg_UpdateRect_Params& params); 452 void OnMsgUpdateRect(const ViewHostMsg_UpdateRect_Params& params);
453 void OnMsgInputEventAck(const IPC::Message& message); 453 void OnMsgInputEventAck(const IPC::Message& message);
454 virtual void OnMsgFocus(); 454 virtual void OnMsgFocus();
455 virtual void OnMsgBlur(); 455 virtual void OnMsgBlur();
456 456
457 void OnMsgSetCursor(const WebCursor& cursor); 457 void OnMsgSetCursor(const WebCursor& cursor);
458 void OnMsgImeUpdateTextInputState(WebKit::WebTextInputType type, 458 void OnMsgImeUpdateTextInputState(ui::TextInputType type,
459 bool can_compose_inline,
459 const gfx::Rect& caret_rect); 460 const gfx::Rect& caret_rect);
460 void OnMsgImeCompositionRangeChanged(const ui::Range& range); 461 void OnMsgImeCompositionRangeChanged(const ui::Range& range);
461 void OnMsgImeCancelComposition(); 462 void OnMsgImeCancelComposition();
462 463
463 void OnMsgDidActivateAcceleratedCompositing(bool activated); 464 void OnMsgDidActivateAcceleratedCompositing(bool activated);
464 465
465 #if defined(OS_POSIX) 466 #if defined(OS_POSIX)
466 void OnMsgGetScreenInfo(gfx::NativeViewId view, 467 void OnMsgGetScreenInfo(gfx::NativeViewId view,
467 WebKit::WebScreenInfo* results); 468 WebKit::WebScreenInfo* results);
468 void OnMsgGetWindowRect(gfx::NativeViewId window_id, gfx::Rect* results); 469 void OnMsgGetWindowRect(gfx::NativeViewId window_id, gfx::Rect* results);
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 657
657 std::vector<gfx::PluginWindowHandle> deferred_plugin_handles_; 658 std::vector<gfx::PluginWindowHandle> deferred_plugin_handles_;
658 659
659 // The last scroll offset of the render widget. 660 // The last scroll offset of the render widget.
660 gfx::Point last_scroll_offset_; 661 gfx::Point last_scroll_offset_;
661 662
662 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost); 663 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHost);
663 }; 664 };
664 665
665 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_ 666 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/browser/renderer_host/render_widget_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698