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

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

Issue 291001: Moved Pepper delegate definition to chrome\renderer to allow it to use... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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/renderer/DEPS ('k') | chrome/renderer/webplugin_delegate_pepper.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/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/renderer/extensions/renderer_extension_bindings.h" 43 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
44 #include "chrome/renderer/localized_error.h" 44 #include "chrome/renderer/localized_error.h"
45 #include "chrome/renderer/media/audio_renderer_impl.h" 45 #include "chrome/renderer/media/audio_renderer_impl.h"
46 #include "chrome/renderer/navigation_state.h" 46 #include "chrome/renderer/navigation_state.h"
47 #include "chrome/renderer/notification_provider.h" 47 #include "chrome/renderer/notification_provider.h"
48 #include "chrome/renderer/plugin_channel_host.h" 48 #include "chrome/renderer/plugin_channel_host.h"
49 #include "chrome/renderer/print_web_view_helper.h" 49 #include "chrome/renderer/print_web_view_helper.h"
50 #include "chrome/renderer/render_process.h" 50 #include "chrome/renderer/render_process.h"
51 #include "chrome/renderer/user_script_slave.h" 51 #include "chrome/renderer/user_script_slave.h"
52 #include "chrome/renderer/visitedlink_slave.h" 52 #include "chrome/renderer/visitedlink_slave.h"
53 #include "chrome/renderer/webplugin_delegate_pepper.h"
53 #include "chrome/renderer/webplugin_delegate_proxy.h" 54 #include "chrome/renderer/webplugin_delegate_proxy.h"
54 #include "chrome/renderer/webworker_proxy.h" 55 #include "chrome/renderer/webworker_proxy.h"
55 #include "grit/generated_resources.h" 56 #include "grit/generated_resources.h"
56 #include "grit/renderer_resources.h" 57 #include "grit/renderer_resources.h"
57 #include "net/base/data_url.h" 58 #include "net/base/data_url.h"
58 #include "net/base/escape.h" 59 #include "net/base/escape.h"
59 #include "net/base/net_errors.h" 60 #include "net/base/net_errors.h"
60 #include "skia/ext/bitmap_platform_device.h" 61 #include "skia/ext/bitmap_platform_device.h"
61 #include "skia/ext/image_operations.h" 62 #include "skia/ext/image_operations.h"
62 #include "webkit/api/public/WebAccessibilityObject.h" 63 #include "webkit/api/public/WebAccessibilityObject.h"
(...skipping 20 matching lines...) Expand all
83 #include "webkit/glue/glue_serialize.h" 84 #include "webkit/glue/glue_serialize.h"
84 #include "webkit/glue/glue_util.h" 85 #include "webkit/glue/glue_util.h"
85 #include "webkit/glue/dom_operations.h" 86 #include "webkit/glue/dom_operations.h"
86 #include "webkit/glue/dom_serializer.h" 87 #include "webkit/glue/dom_serializer.h"
87 #include "webkit/glue/image_decoder.h" 88 #include "webkit/glue/image_decoder.h"
88 #include "webkit/glue/media/buffered_data_source.h" 89 #include "webkit/glue/media/buffered_data_source.h"
89 #include "webkit/glue/media/simple_data_source.h" 90 #include "webkit/glue/media/simple_data_source.h"
90 #include "webkit/glue/password_form.h" 91 #include "webkit/glue/password_form.h"
91 #include "webkit/glue/plugins/plugin_list.h" 92 #include "webkit/glue/plugins/plugin_list.h"
92 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 93 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
93 #include "webkit/glue/plugins/webplugin_delegate_pepper_impl.h"
94 #include "webkit/glue/searchable_form_data.h" 94 #include "webkit/glue/searchable_form_data.h"
95 #include "webkit/glue/webaccessibilitymanager_impl.h" 95 #include "webkit/glue/webaccessibilitymanager_impl.h"
96 #include "webkit/glue/webdropdata.h" 96 #include "webkit/glue/webdropdata.h"
97 #include "webkit/glue/webkit_glue.h" 97 #include "webkit/glue/webkit_glue.h"
98 #include "webkit/glue/webmediaplayer_impl.h" 98 #include "webkit/glue/webmediaplayer_impl.h"
99 #include "webkit/glue/webplugin_impl.h" 99 #include "webkit/glue/webplugin_impl.h"
100 #include "webkit/glue/webview.h" 100 #include "webkit/glue/webview.h"
101 101
102 #if defined(OS_WIN) 102 #if defined(OS_WIN)
103 // TODO(port): these files are currently Windows only because they concern: 103 // TODO(port): these files are currently Windows only because they concern:
(...skipping 2347 matching lines...) Expand 10 before | Expand all | Expand 10 after
2451 2451
2452 const std::string* mime_type_to_use; 2452 const std::string* mime_type_to_use;
2453 if (!actual_mime_type->empty()) 2453 if (!actual_mime_type->empty())
2454 mime_type_to_use = actual_mime_type; 2454 mime_type_to_use = actual_mime_type;
2455 else 2455 else
2456 mime_type_to_use = &mime_type; 2456 mime_type_to_use = &mime_type;
2457 2457
2458 #if defined(PEPPER_APIS_ENABLED) 2458 #if defined(PEPPER_APIS_ENABLED)
2459 const char kPepperPrefix[] = "pepper-"; 2459 const char kPepperPrefix[] = "pepper-";
2460 if (StartsWithASCII(*mime_type_to_use, kPepperPrefix, true)) { 2460 if (StartsWithASCII(*mime_type_to_use, kPepperPrefix, true)) {
2461 return WebPluginDelegatePepperImpl::Create( 2461 return WebPluginDelegatePepper::Create(
2462 path, *mime_type_to_use, gfx::NativeViewFromId(host_window_)); 2462 path, *mime_type_to_use, gfx::NativeViewFromId(host_window_));
2463 } 2463 }
2464 #endif 2464 #endif
2465 2465
2466 bool in_process_plugin = RenderProcess::current()->in_process_plugins(); 2466 bool in_process_plugin = RenderProcess::current()->in_process_plugins();
2467 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) { 2467 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) {
2468 if (mime_type == "application/x-nacl-srpc") { 2468 if (mime_type == "application/x-nacl-srpc") {
2469 in_process_plugin = true; 2469 in_process_plugin = true;
2470 } 2470 }
2471 } 2471 }
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
3660 new PluginMsg_SignalModalDialogEvent(host_window_)); 3660 new PluginMsg_SignalModalDialogEvent(host_window_));
3661 3661
3662 message->EnableMessagePumping(); // Runs a nested message loop. 3662 message->EnableMessagePumping(); // Runs a nested message loop.
3663 bool rv = Send(message); 3663 bool rv = Send(message);
3664 3664
3665 PluginChannelHost::Broadcast( 3665 PluginChannelHost::Broadcast(
3666 new PluginMsg_ResetModalDialogEvent(host_window_)); 3666 new PluginMsg_ResetModalDialogEvent(host_window_));
3667 3667
3668 return rv; 3668 return rv;
3669 } 3669 }
OLDNEW
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/webplugin_delegate_pepper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698