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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.h

Issue 6259013: Update Mac plugin IME handling to match updated spec (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk Created 9 years, 11 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
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ 5 #ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
6 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ 6 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // Informs the plugin that its containing content view has gained or lost 83 // Informs the plugin that its containing content view has gained or lost
84 // first responder status. 84 // first responder status.
85 virtual void SetContentAreaFocus(bool has_focus); 85 virtual void SetContentAreaFocus(bool has_focus);
86 #if defined(OS_MACOSX) 86 #if defined(OS_MACOSX)
87 // Informs the plugin that its enclosing window has gained or lost focus. 87 // Informs the plugin that its enclosing window has gained or lost focus.
88 virtual void SetWindowFocus(bool window_has_focus); 88 virtual void SetWindowFocus(bool window_has_focus);
89 // Informs the plugin that its container (window/tab) has changed visibility. 89 // Informs the plugin that its container (window/tab) has changed visibility.
90 virtual void SetContainerVisibility(bool is_visible); 90 virtual void SetContainerVisibility(bool is_visible);
91 // Informs the plugin that its enclosing window's frame has changed. 91 // Informs the plugin that its enclosing window's frame has changed.
92 virtual void WindowFrameChanged(gfx::Rect window_frame, gfx::Rect view_frame); 92 virtual void WindowFrameChanged(gfx::Rect window_frame, gfx::Rect view_frame);
93 // Informs the plugin that text is avaiable from plugin IME. 93 // Informs the plugin that plugin IME has completed.
94 virtual void ImeCompositionConfirmed(const string16& text, int plugin_id); 94 // If |text| is empty, composition was cancelled.
95 virtual void ImeCompositionCompleted(const string16& text, int plugin_id);
95 #endif 96 #endif
96 97
97 // IPC::Channel::Listener implementation: 98 // IPC::Channel::Listener implementation:
98 virtual bool OnMessageReceived(const IPC::Message& msg); 99 virtual bool OnMessageReceived(const IPC::Message& msg);
99 virtual void OnChannelError(); 100 virtual void OnChannelError();
100 101
101 // IPC::Message::Sender implementation: 102 // IPC::Message::Sender implementation:
102 virtual bool Send(IPC::Message* msg); 103 virtual bool Send(IPC::Message* msg);
103 104
104 virtual void SendJavaScriptStream(const GURL& url, 105 virtual void SendJavaScriptStream(const GURL& url,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 bool* success); 158 bool* success);
158 void OnMissingPluginStatus(int status); 159 void OnMissingPluginStatus(int status);
159 void OnGetCPBrowsingContext(uint32* context); 160 void OnGetCPBrowsingContext(uint32* context);
160 void OnCancelDocumentLoad(); 161 void OnCancelDocumentLoad();
161 void OnInitiateHTTPRangeRequest(const std::string& url, 162 void OnInitiateHTTPRangeRequest(const std::string& url,
162 const std::string& range_info, 163 const std::string& range_info,
163 int range_request_id); 164 int range_request_id);
164 void OnDeferResourceLoading(unsigned long resource_id, bool defer); 165 void OnDeferResourceLoading(unsigned long resource_id, bool defer);
165 166
166 #if defined(OS_MACOSX) 167 #if defined(OS_MACOSX)
167 void OnSetImeEnabled(bool enabled); 168 void OnFocusChanged(bool focused);
169 void OnStartIme();
168 void OnBindFakePluginWindowHandle(bool opaque); 170 void OnBindFakePluginWindowHandle(bool opaque);
169 void OnUpdateGeometry_ACK(int ack_key); 171 void OnUpdateGeometry_ACK(int ack_key);
170 void OnAcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window, 172 void OnAcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
171 int32 width, 173 int32 width,
172 int32 height, 174 int32 height,
173 uint64 io_surface_identifier); 175 uint64 io_surface_identifier);
174 void OnAcceleratedSurfaceSetTransportDIB(gfx::PluginWindowHandle window, 176 void OnAcceleratedSurfaceSetTransportDIB(gfx::PluginWindowHandle window,
175 int32 width, 177 int32 width,
176 int32 height, 178 int32 height,
177 TransportDIB::Handle transport_dib); 179 TransportDIB::Handle transport_dib);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 // This lets us know which portion of the backing store has been painted into. 278 // This lets us know which portion of the backing store has been painted into.
277 gfx::Rect backing_store_painted_; 279 gfx::Rect backing_store_painted_;
278 280
279 // The url of the main frame hosting the plugin. 281 // The url of the main frame hosting the plugin.
280 GURL page_url_; 282 GURL page_url_;
281 283
282 DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy); 284 DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
283 }; 285 };
284 286
285 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_ 287 #endif // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | chrome/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698