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

Side by Side Diff: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

Issue 11437038: Revert 171408 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h" 5 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h"
6 6
7 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 7 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
8 #include "content/browser/renderer_host/pepper/pepper_flash_browser_host.h" 8 #include "content/browser/renderer_host/pepper/pepper_flash_browser_host.h"
9 #include "content/browser/renderer_host/pepper/pepper_flash_file_host.h"
10 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" 9 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
11 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" 10 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
12 #include "content/browser/renderer_host/pepper/pepper_printing_host.h" 11 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
13 #include "ppapi/host/resource_host.h" 12 #include "ppapi/host/resource_host.h"
14 #include "ppapi/proxy/ppapi_messages.h" 13 #include "ppapi/proxy/ppapi_messages.h"
15 #include "ppapi/shared_impl/ppapi_permissions.h" 14 #include "ppapi/shared_impl/ppapi_permissions.h"
16 15
17 using ppapi::host::ResourceHost; 16 using ppapi::host::ResourceHost;
18 17
19 namespace content { 18 namespace content {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 55 }
57 } 56 }
58 } 57 }
59 58
60 // Flash interfaces. 59 // Flash interfaces.
61 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) { 60 if (GetPermissions().HasPermission(ppapi::PERMISSION_FLASH)) {
62 switch (message.type()) { 61 switch (message.type()) {
63 case PpapiHostMsg_Flash_Create::ID: 62 case PpapiHostMsg_Flash_Create::ID:
64 return scoped_ptr<ResourceHost>(new PepperFlashBrowserHost( 63 return scoped_ptr<ResourceHost>(new PepperFlashBrowserHost(
65 host_, instance, params.pp_resource())); 64 host_, instance, params.pp_resource()));
66 case PpapiHostMsg_FlashFile_Create::ID:
67 return scoped_ptr<ResourceHost>(new PepperFlashFileHost(
68 host_, instance, params.pp_resource()));
69 } 65 }
70 } 66 }
71 67
72 return scoped_ptr<ResourceHost>(); 68 return scoped_ptr<ResourceHost>();
73 } 69 }
74 70
75 const ppapi::PpapiPermissions& 71 const ppapi::PpapiPermissions&
76 ContentBrowserPepperHostFactory::GetPermissions() const { 72 ContentBrowserPepperHostFactory::GetPermissions() const {
77 return host_->GetPpapiHost()->permissions(); 73 return host_->GetPpapiHost()->permissions();
78 } 74 }
79 75
80 } // namespace content 76 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698