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

Side by Side Diff: chrome/plugin/webplugin_proxy.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_proxy.h ('k') | chrome/renderer/render_view.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_proxy.h" 5 #include "chrome/plugin/webplugin_proxy.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include "app/win_util.h" 10 #include "app/win_util.h"
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 Send(new PluginHostMsg_InitiateHTTPRangeRequest( 641 Send(new PluginHostMsg_InitiateHTTPRangeRequest(
642 route_id_, url, range_info, range_request_id)); 642 route_id_, url, range_info, range_request_id));
643 } 643 }
644 644
645 void WebPluginProxy::SetDeferResourceLoading(unsigned long resource_id, 645 void WebPluginProxy::SetDeferResourceLoading(unsigned long resource_id,
646 bool defer) { 646 bool defer) {
647 Send(new PluginHostMsg_DeferResourceLoading(route_id_, resource_id, defer)); 647 Send(new PluginHostMsg_DeferResourceLoading(route_id_, resource_id, defer));
648 } 648 }
649 649
650 #if defined(OS_MACOSX) 650 #if defined(OS_MACOSX)
651 void WebPluginProxy::SetImeEnabled(bool enabled) {
652 IPC::Message* msg = new PluginHostMsg_SetImeEnabled(route_id_, enabled);
653 // This message can be sent during event-handling, and needs to be delivered
654 // within that context.
655 msg->set_unblock(true);
656 Send(msg);
657 }
658
651 void WebPluginProxy::BindFakePluginWindowHandle(bool opaque) { 659 void WebPluginProxy::BindFakePluginWindowHandle(bool opaque) {
652 Send(new PluginHostMsg_BindFakePluginWindowHandle(route_id_, opaque)); 660 Send(new PluginHostMsg_BindFakePluginWindowHandle(route_id_, opaque));
653 } 661 }
654 662
655 WebPluginAcceleratedSurface* WebPluginProxy::GetAcceleratedSurface() { 663 WebPluginAcceleratedSurface* WebPluginProxy::GetAcceleratedSurface() {
656 if (!accelerated_surface_.get()) 664 if (!accelerated_surface_.get())
657 accelerated_surface_.reset(new WebPluginAcceleratedSurfaceProxy(this)); 665 accelerated_surface_.reset(new WebPluginAcceleratedSurfaceProxy(this));
658 return accelerated_surface_.get(); 666 return accelerated_surface_.get();
659 } 667 }
660 668
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 while (index != resource_clients_.end()) { 715 while (index != resource_clients_.end()) {
708 WebPluginResourceClient* client = (*index).second; 716 WebPluginResourceClient* client = (*index).second;
709 717
710 if (client == resource_client) { 718 if (client == resource_client) {
711 resource_clients_.erase(index++); 719 resource_clients_.erase(index++);
712 } else { 720 } else {
713 index++; 721 index++;
714 } 722 }
715 } 723 }
716 } 724 }
OLDNEW
« no previous file with comments | « chrome/plugin/webplugin_proxy.h ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698