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

Side by Side Diff: content/plugin/webplugin_proxy.cc

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | « content/plugin/webplugin_proxy.h ('k') | printing/printed_document_aura.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) 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 #include "content/plugin/webplugin_proxy.h" 5 #include "content/plugin/webplugin_proxy.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/scoped_handle.h" 10 #include "base/memory/scoped_handle.h"
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 } else { 741 } else {
742 index++; 742 index++;
743 } 743 }
744 } 744 }
745 } 745 }
746 746
747 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) { 747 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
748 Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id)); 748 Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
749 } 749 }
750 750
751 #if defined(OS_WIN) 751 #if defined(OS_WIN) && !defined(USE_AURA)
752 void WebPluginProxy::UpdateIMEStatus() { 752 void WebPluginProxy::UpdateIMEStatus() {
753 // Retrieve the IME status from a plug-in and send it to a renderer process 753 // Retrieve the IME status from a plug-in and send it to a renderer process
754 // when the plug-in has updated it. 754 // when the plug-in has updated it.
755 int input_type; 755 int input_type;
756 gfx::Rect caret_rect; 756 gfx::Rect caret_rect;
757 if (!delegate_->GetIMEStatus(&input_type, &caret_rect)) 757 if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
758 return; 758 return;
759 759
760 Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect)); 760 Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
761 } 761 }
762 #endif 762 #endif
OLDNEW
« no previous file with comments | « content/plugin/webplugin_proxy.h ('k') | printing/printed_document_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698