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

Side by Side Diff: content/renderer/pepper/content_renderer_pepper_host_factory.cc

Issue 11225021: Move flash clipboard to the new proxy and add custom format support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/pepper/pepper_flash_clipboard_host.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) 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/pepper/content_renderer_pepper_host_factory.h" 5 #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/pepper/pepper_file_chooser_host.h" 8 #include "content/renderer/pepper/pepper_file_chooser_host.h"
9 #include "content/renderer/pepper/pepper_flash_clipboard_host.h"
9 #include "content/renderer/pepper/pepper_flash_host.h" 10 #include "content/renderer/pepper/pepper_flash_host.h"
10 #include "content/renderer/pepper/pepper_websocket_host.h" 11 #include "content/renderer/pepper/pepper_websocket_host.h"
11 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 12 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
12 #include "ppapi/host/resource_host.h" 13 #include "ppapi/host/resource_host.h"
13 #include "ppapi/proxy/ppapi_messages.h" 14 #include "ppapi/proxy/ppapi_messages.h"
14 15
15 using ppapi::host::ResourceHost; 16 using ppapi::host::ResourceHost;
16 17
17 namespace content { 18 namespace content {
18 19
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 host_, instance, params.pp_resource())); 57 host_, instance, params.pp_resource()));
57 } 58 }
58 } 59 }
59 60
60 // Resources for Flash interfaces. 61 // Resources for Flash interfaces.
61 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) { 62 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {
62 switch (message.type()) { 63 switch (message.type()) {
63 case PpapiHostMsg_Flash_Create::ID: 64 case PpapiHostMsg_Flash_Create::ID:
64 return scoped_ptr<ResourceHost>(new PepperFlashHost( 65 return scoped_ptr<ResourceHost>(new PepperFlashHost(
65 host_, instance, params.pp_resource())); 66 host_, instance, params.pp_resource()));
67 case PpapiHostMsg_FlashClipboard_Create::ID:
68 return scoped_ptr<ResourceHost>(new PepperFlashClipboardHost(
69 host_, instance, params.pp_resource()));
66 } 70 }
67 } 71 }
68 72
69 return scoped_ptr<ResourceHost>(); 73 return scoped_ptr<ResourceHost>();
70 } 74 }
71 75
72 const ppapi::PpapiPermissions& 76 const ppapi::PpapiPermissions&
73 ContentRendererPepperHostFactory::GetPermissions() const { 77 ContentRendererPepperHostFactory::GetPermissions() const {
74 return host_->GetPpapiHost()->permissions(); 78 return host_->GetPpapiHost()->permissions();
75 } 79 }
76 80
77 } // namespace content 81 } // namespace content
OLDNEW
« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/pepper/pepper_flash_clipboard_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698