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

Side by Side Diff: content/renderer/npapi/webplugin_delegate_proxy.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/npapi/webplugin_delegate_proxy.h" 5 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #elif defined(USE_X11) 9 #elif defined(USE_X11)
10 #include <cairo/cairo.h> 10 #include <cairo/cairo.h>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #endif 60 #endif
61 61
62 #if defined(OS_MACOSX) 62 #if defined(OS_MACOSX)
63 #include "base/mac/mac_util.h" 63 #include "base/mac/mac_util.h"
64 #endif 64 #endif
65 65
66 #if defined(OS_WIN) 66 #if defined(OS_WIN)
67 #include "content/public/common/sandbox_init.h" 67 #include "content/public/common/sandbox_init.h"
68 #endif 68 #endif
69 69
70 using WebKit::WebBindings; 70 using blink::WebBindings;
71 using WebKit::WebCursorInfo; 71 using blink::WebCursorInfo;
72 using WebKit::WebDragData; 72 using blink::WebDragData;
73 using WebKit::WebInputEvent; 73 using blink::WebInputEvent;
74 using WebKit::WebString; 74 using blink::WebString;
75 using WebKit::WebView; 75 using blink::WebView;
76 76
77 namespace content { 77 namespace content {
78 78
79 namespace { 79 namespace {
80 80
81 class ScopedLogLevel { 81 class ScopedLogLevel {
82 public: 82 public:
83 explicit ScopedLogLevel(int level); 83 explicit ScopedLogLevel(int level);
84 ~ScopedLogLevel(); 84 ~ScopedLogLevel();
85 85
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 // sync messages they might interact with (Paint, HandleEvent, etc.). 841 // sync messages they might interact with (Paint, HandleEvent, etc.).
842 msg->set_unblock(true); 842 msg->set_unblock(true);
843 Send(msg); 843 Send(msg);
844 } 844 }
845 845
846 void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) { 846 void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) {
847 IPC::Message* msg; 847 IPC::Message* msg;
848 if (is_visible) { 848 if (is_visible) {
849 gfx::Rect window_frame = render_view_->rootWindowRect(); 849 gfx::Rect window_frame = render_view_->rootWindowRect();
850 gfx::Rect view_frame = render_view_->windowRect(); 850 gfx::Rect view_frame = render_view_->windowRect();
851 WebKit::WebView* webview = render_view_->webview(); 851 blink::WebView* webview = render_view_->webview();
852 msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame, 852 msg = new PluginMsg_ContainerShown(instance_id_, window_frame, view_frame,
853 webview && webview->isActive()); 853 webview && webview->isActive());
854 } else { 854 } else {
855 msg = new PluginMsg_ContainerHidden(instance_id_); 855 msg = new PluginMsg_ContainerHidden(instance_id_);
856 } 856 }
857 // Make sure visibility events are delivered in the right order relative to 857 // Make sure visibility events are delivered in the right order relative to
858 // sync messages they might interact with (Paint, HandleEvent, etc.). 858 // sync messages they might interact with (Paint, HandleEvent, etc.).
859 msg->set_unblock(true); 859 msg->set_unblock(true);
860 Send(msg); 860 Send(msg);
861 } 861 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 928
929 render_view_->Send(new ViewHostMsg_TextInputTypeChanged( 929 render_view_->Send(new ViewHostMsg_TextInputTypeChanged(
930 render_view_->routing_id(), 930 render_view_->routing_id(),
931 static_cast<ui::TextInputType>(input_type), 931 static_cast<ui::TextInputType>(input_type),
932 ui::TEXT_INPUT_MODE_DEFAULT, 932 ui::TEXT_INPUT_MODE_DEFAULT,
933 true)); 933 true));
934 934
935 ViewHostMsg_SelectionBounds_Params bounds_params; 935 ViewHostMsg_SelectionBounds_Params bounds_params;
936 bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect; 936 bounds_params.anchor_rect = bounds_params.focus_rect = caret_rect;
937 bounds_params.anchor_dir = bounds_params.focus_dir = 937 bounds_params.anchor_dir = bounds_params.focus_dir =
938 WebKit::WebTextDirectionLeftToRight; 938 blink::WebTextDirectionLeftToRight;
939 bounds_params.is_anchor_first = true; 939 bounds_params.is_anchor_first = true;
940 render_view_->Send(new ViewHostMsg_SelectionBoundsChanged( 940 render_view_->Send(new ViewHostMsg_SelectionBoundsChanged(
941 render_view_->routing_id(), 941 render_view_->routing_id(),
942 bounds_params)); 942 bounds_params));
943 } 943 }
944 #endif 944 #endif
945 945
946 void WebPluginDelegateProxy::OnCancelResource(int id) { 946 void WebPluginDelegateProxy::OnCancelResource(int id) {
947 if (plugin_) 947 if (plugin_)
948 plugin_->CancelResource(id); 948 plugin_->CancelResource(id);
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 1241
1242 plugin_->URLRedirectResponse(allow, resource_id); 1242 plugin_->URLRedirectResponse(allow, resource_id);
1243 } 1243 }
1244 1244
1245 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, 1245 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
1246 bool* result) { 1246 bool* result) {
1247 *result = plugin_->CheckIfRunInsecureContent(url); 1247 *result = plugin_->CheckIfRunInsecureContent(url);
1248 } 1248 }
1249 1249
1250 } // namespace content 1250 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/npapi/webplugin_delegate_proxy.h ('k') | content/renderer/npapi/webplugin_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698