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

Side by Side Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 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
« no previous file with comments | « chrome/renderer/webplugin_delegate_pepper.cc ('k') | chrome/renderer/websharedworker_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/renderer/webplugin_delegate_proxy.h" 5 #include "chrome/renderer/webplugin_delegate_proxy.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/gfx/blit.h" 9 #include "app/gfx/blit.h"
10 #include "app/gfx/canvas.h" 10 #include "app/gfx/canvas.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/common/render_messages.h" 22 #include "chrome/common/render_messages.h"
23 #include "chrome/plugin/npobject_proxy.h" 23 #include "chrome/plugin/npobject_proxy.h"
24 #include "chrome/plugin/npobject_stub.h" 24 #include "chrome/plugin/npobject_stub.h"
25 #include "chrome/plugin/npobject_util.h" 25 #include "chrome/plugin/npobject_util.h"
26 #include "chrome/renderer/render_thread.h" 26 #include "chrome/renderer/render_thread.h"
27 #include "chrome/renderer/render_view.h" 27 #include "chrome/renderer/render_view.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 #include "grit/renderer_resources.h" 29 #include "grit/renderer_resources.h"
30 #include "net/base/mime_util.h" 30 #include "net/base/mime_util.h"
31 #include "printing/native_metafile.h" 31 #include "printing/native_metafile.h"
32 #include "webkit/api/public/WebBindings.h" 32 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
33 #include "webkit/api/public/WebCursorInfo.h" 33 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
34 #include "webkit/api/public/WebDragData.h" 34 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
35 #include "webkit/api/public/WebFrame.h" 35 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
36 #include "webkit/api/public/WebString.h" 36 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
37 #include "webkit/api/public/WebVector.h" 37 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
38 #include "webkit/api/public/WebView.h" 38 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
39 #include "webkit/glue/webkit_glue.h" 39 #include "webkit/glue/webkit_glue.h"
40 #include "webkit/glue/webplugin.h" 40 #include "webkit/glue/webplugin.h"
41 41
42 #if defined(OS_POSIX) 42 #if defined(OS_POSIX)
43 #include "ipc/ipc_channel_posix.h" 43 #include "ipc/ipc_channel_posix.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_MACOSX) 46 #if defined(OS_MACOSX)
47 #include "base/scoped_cftyperef.h" 47 #include "base/scoped_cftyperef.h"
48 #endif 48 #endif
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) { 1101 intptr_t existing_stream, bool notify_needed, intptr_t notify_data) {
1102 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(), 1102 plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
1103 existing_stream, notify_needed, 1103 existing_stream, notify_needed,
1104 notify_data); 1104 notify_data);
1105 } 1105 }
1106 1106
1107 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id, 1107 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id,
1108 bool defer) { 1108 bool defer) {
1109 plugin_->SetDeferResourceLoading(resource_id, defer); 1109 plugin_->SetDeferResourceLoading(resource_id, defer);
1110 } 1110 }
OLDNEW
« no previous file with comments | « chrome/renderer/webplugin_delegate_pepper.cc ('k') | chrome/renderer/websharedworker_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698