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

Side by Side Diff: chrome/plugin/webplugin_delegate_stub.cc

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/plugin/webplugin_delegate_stub.h ('k') | chrome/plugin/webplugin_proxy.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include "chrome/plugin/webplugin_delegate_stub.h" 5 #include "chrome/plugin/webplugin_delegate_stub.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/common/child_process_logging.h" 10 #include "chrome/common/child_process_logging.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometry, OnUpdateGeometry) 118 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometry, OnUpdateGeometry)
119 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometrySync, OnUpdateGeometry) 119 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometrySync, OnUpdateGeometry)
120 IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream, 120 IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream,
121 OnSendJavaScriptStream) 121 OnSendJavaScriptStream)
122 IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus) 122 IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus)
123 #if defined(OS_MACOSX) 123 #if defined(OS_MACOSX)
124 IPC_MESSAGE_HANDLER(PluginMsg_SetWindowFocus, OnSetWindowFocus) 124 IPC_MESSAGE_HANDLER(PluginMsg_SetWindowFocus, OnSetWindowFocus)
125 IPC_MESSAGE_HANDLER(PluginMsg_ContainerHidden, OnContainerHidden) 125 IPC_MESSAGE_HANDLER(PluginMsg_ContainerHidden, OnContainerHidden)
126 IPC_MESSAGE_HANDLER(PluginMsg_ContainerShown, OnContainerShown) 126 IPC_MESSAGE_HANDLER(PluginMsg_ContainerShown, OnContainerShown)
127 IPC_MESSAGE_HANDLER(PluginMsg_WindowFrameChanged, OnWindowFrameChanged) 127 IPC_MESSAGE_HANDLER(PluginMsg_WindowFrameChanged, OnWindowFrameChanged)
128 IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionConfirmed, 128 IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionCompleted,
129 OnImeCompositionConfirmed) 129 OnImeCompositionCompleted)
130 #endif 130 #endif
131 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualResponse, 131 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualResponse,
132 OnDidReceiveManualResponse) 132 OnDidReceiveManualResponse)
133 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualData, OnDidReceiveManualData) 133 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualData, OnDidReceiveManualData)
134 IPC_MESSAGE_HANDLER(PluginMsg_DidFinishManualLoading, 134 IPC_MESSAGE_HANDLER(PluginMsg_DidFinishManualLoading,
135 OnDidFinishManualLoading) 135 OnDidFinishManualLoading)
136 IPC_MESSAGE_HANDLER(PluginMsg_DidManualLoadFail, OnDidManualLoadFail) 136 IPC_MESSAGE_HANDLER(PluginMsg_DidManualLoadFail, OnDidManualLoadFail)
137 IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin) 137 IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin)
138 IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply, 138 IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply,
139 OnHandleURLRequestReply) 139 OnHandleURLRequestReply)
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 delegate_->SetWindowHasFocus(has_focus); 371 delegate_->SetWindowHasFocus(has_focus);
372 } 372 }
373 } 373 }
374 374
375 void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect& window_frame, 375 void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect& window_frame,
376 const gfx::Rect& view_frame) { 376 const gfx::Rect& view_frame) {
377 if (delegate_) 377 if (delegate_)
378 delegate_->WindowFrameChanged(window_frame, view_frame); 378 delegate_->WindowFrameChanged(window_frame, view_frame);
379 } 379 }
380 380
381 void WebPluginDelegateStub::OnImeCompositionConfirmed(const string16& text) { 381 void WebPluginDelegateStub::OnImeCompositionCompleted(const string16& text) {
382 if (delegate_) 382 if (delegate_)
383 delegate_->ImeCompositionConfirmed(text); 383 delegate_->ImeCompositionCompleted(text);
384 } 384 }
385 #endif // OS_MACOSX 385 #endif // OS_MACOSX
386 386
387 void WebPluginDelegateStub::OnDidReceiveManualResponse( 387 void WebPluginDelegateStub::OnDidReceiveManualResponse(
388 const GURL& url, 388 const GURL& url,
389 const PluginMsg_DidReceiveResponseParams& params) { 389 const PluginMsg_DidReceiveResponseParams& params) {
390 delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers, 390 delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers,
391 params.expected_length, 391 params.expected_length,
392 params.last_modified); 392 params.last_modified);
393 } 393 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 webplugin_->OnResourceCreated(resource_id, resource_client); 474 webplugin_->OnResourceCreated(resource_id, resource_client);
475 } 475 }
476 476
477 #if defined(OS_MACOSX) 477 #if defined(OS_MACOSX)
478 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( 478 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
479 gfx::PluginWindowHandle window) { 479 gfx::PluginWindowHandle window) {
480 delegate_->set_windowed_handle(window); 480 delegate_->set_windowed_handle(window);
481 } 481 }
482 #endif 482 #endif
483 483
OLDNEW
« no previous file with comments | « chrome/plugin/webplugin_delegate_stub.h ('k') | chrome/plugin/webplugin_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698