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

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

Issue 3782012: Merge 62820 - Implement IME for Mac plugins using the Cocoa event model on 10... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/
Patch Set: Created 10 years, 2 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometry, OnUpdateGeometry) 115 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometry, OnUpdateGeometry)
116 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometrySync, OnUpdateGeometry) 116 IPC_MESSAGE_HANDLER(PluginMsg_UpdateGeometrySync, OnUpdateGeometry)
117 IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream, 117 IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream,
118 OnSendJavaScriptStream) 118 OnSendJavaScriptStream)
119 IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus) 119 IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus)
120 #if defined(OS_MACOSX) 120 #if defined(OS_MACOSX)
121 IPC_MESSAGE_HANDLER(PluginMsg_SetWindowFocus, OnSetWindowFocus) 121 IPC_MESSAGE_HANDLER(PluginMsg_SetWindowFocus, OnSetWindowFocus)
122 IPC_MESSAGE_HANDLER(PluginMsg_ContainerHidden, OnContainerHidden) 122 IPC_MESSAGE_HANDLER(PluginMsg_ContainerHidden, OnContainerHidden)
123 IPC_MESSAGE_HANDLER(PluginMsg_ContainerShown, OnContainerShown) 123 IPC_MESSAGE_HANDLER(PluginMsg_ContainerShown, OnContainerShown)
124 IPC_MESSAGE_HANDLER(PluginMsg_WindowFrameChanged, OnWindowFrameChanged) 124 IPC_MESSAGE_HANDLER(PluginMsg_WindowFrameChanged, OnWindowFrameChanged)
125 IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionConfirmed,
126 OnImeCompositionConfirmed)
125 #endif 127 #endif
126 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualResponse, 128 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualResponse,
127 OnDidReceiveManualResponse) 129 OnDidReceiveManualResponse)
128 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualData, OnDidReceiveManualData) 130 IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveManualData, OnDidReceiveManualData)
129 IPC_MESSAGE_HANDLER(PluginMsg_DidFinishManualLoading, 131 IPC_MESSAGE_HANDLER(PluginMsg_DidFinishManualLoading,
130 OnDidFinishManualLoading) 132 OnDidFinishManualLoading)
131 IPC_MESSAGE_HANDLER(PluginMsg_DidManualLoadFail, OnDidManualLoadFail) 133 IPC_MESSAGE_HANDLER(PluginMsg_DidManualLoadFail, OnDidManualLoadFail)
132 IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin) 134 IPC_MESSAGE_HANDLER(PluginMsg_InstallMissingPlugin, OnInstallMissingPlugin)
133 IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply, 135 IPC_MESSAGE_HANDLER(PluginMsg_HandleURLRequestReply,
134 OnHandleURLRequestReply) 136 OnHandleURLRequestReply)
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 delegate_->SetContainerVisibility(true); 362 delegate_->SetContainerVisibility(true);
361 delegate_->SetWindowHasFocus(has_focus); 363 delegate_->SetWindowHasFocus(has_focus);
362 } 364 }
363 } 365 }
364 366
365 void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect& window_frame, 367 void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect& window_frame,
366 const gfx::Rect& view_frame) { 368 const gfx::Rect& view_frame) {
367 if (delegate_) 369 if (delegate_)
368 delegate_->WindowFrameChanged(window_frame, view_frame); 370 delegate_->WindowFrameChanged(window_frame, view_frame);
369 } 371 }
372
373 void WebPluginDelegateStub::OnImeCompositionConfirmed(const string16& text) {
374 if (delegate_)
375 delegate_->ImeCompositionConfirmed(text);
376 }
370 #endif // OS_MACOSX 377 #endif // OS_MACOSX
371 378
372 void WebPluginDelegateStub::OnDidReceiveManualResponse( 379 void WebPluginDelegateStub::OnDidReceiveManualResponse(
373 const GURL& url, 380 const GURL& url,
374 const PluginMsg_DidReceiveResponseParams& params) { 381 const PluginMsg_DidReceiveResponseParams& params) {
375 delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers, 382 delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers,
376 params.expected_length, 383 params.expected_length,
377 params.last_modified); 384 params.last_modified);
378 } 385 }
379 386
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 webplugin_->OnResourceCreated(resource_id, resource_client); 470 webplugin_->OnResourceCreated(resource_id, resource_client);
464 } 471 }
465 472
466 #if defined(OS_MACOSX) 473 #if defined(OS_MACOSX)
467 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( 474 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
468 gfx::PluginWindowHandle window) { 475 gfx::PluginWindowHandle window) {
469 delegate_->set_windowed_handle(window); 476 delegate_->set_windowed_handle(window);
470 } 477 }
471 #endif 478 #endif
472 479
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