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

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

Issue 2466073002: Movw GamepadService out of content/browser/ and into device/ (Closed)
Patch Set: Fixed everything but one unittest Created 4 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
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/pepper_gamepad_host.h" 5 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/gamepad/gamepad_service.h"
9 #include "content/public/browser/browser_ppapi_host.h" 8 #include "content/public/browser/browser_ppapi_host.h"
9 #include "device/gamepad/gamepad_service.h"
10 #include "ppapi/c/pp_errors.h" 10 #include "ppapi/c/pp_errors.h"
11 #include "ppapi/host/dispatch_host_message.h" 11 #include "ppapi/host/dispatch_host_message.h"
12 #include "ppapi/host/host_message_context.h" 12 #include "ppapi/host/host_message_context.h"
13 #include "ppapi/host/ppapi_host.h" 13 #include "ppapi/host/ppapi_host.h"
14 #include "ppapi/proxy/ppapi_messages.h" 14 #include "ppapi/proxy/ppapi_messages.h"
15 #include "ppapi/shared_impl/ppb_gamepad_shared.h" 15 #include "ppapi/shared_impl/ppb_gamepad_shared.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 PepperGamepadHost::PepperGamepadHost(BrowserPpapiHost* host, 19 PepperGamepadHost::PepperGamepadHost(BrowserPpapiHost* host,
20 PP_Instance instance, 20 PP_Instance instance,
21 PP_Resource resource) 21 PP_Resource resource)
22 : ResourceHost(host->GetPpapiHost(), instance, resource), 22 : ResourceHost(host->GetPpapiHost(), instance, resource),
23 browser_ppapi_host_(host), 23 browser_ppapi_host_(host),
24 gamepad_service_(GamepadService::GetInstance()), 24 gamepad_service_(device::GamepadService::GetInstance()),
25 is_started_(false), 25 is_started_(false),
26 weak_factory_(this) {} 26 weak_factory_(this) {}
27 27
28 PepperGamepadHost::PepperGamepadHost(GamepadService* gamepad_service, 28 PepperGamepadHost::PepperGamepadHost(device::GamepadService* gamepad_service,
29 BrowserPpapiHost* host, 29 BrowserPpapiHost* host,
30 PP_Instance instance, 30 PP_Instance instance,
31 PP_Resource resource) 31 PP_Resource resource)
32 : ResourceHost(host->GetPpapiHost(), instance, resource), 32 : ResourceHost(host->GetPpapiHost(), instance, resource),
33 browser_ppapi_host_(host), 33 browser_ppapi_host_(host),
34 gamepad_service_(gamepad_service), 34 gamepad_service_(gamepad_service),
35 is_started_(false), 35 is_started_(false),
36 weak_factory_(this) {} 36 weak_factory_(this) {}
37 37
38 PepperGamepadHost::~PepperGamepadHost() { 38 PepperGamepadHost::~PepperGamepadHost() {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 base::SharedMemoryHandle handle = 73 base::SharedMemoryHandle handle =
74 gamepad_service_->GetSharedMemoryHandleForProcess( 74 gamepad_service_->GetSharedMemoryHandleForProcess(
75 browser_ppapi_host_->GetPluginProcess().Handle()); 75 browser_ppapi_host_->GetPluginProcess().Handle());
76 76
77 context.params.AppendHandle(ppapi::proxy::SerializedHandle( 77 context.params.AppendHandle(ppapi::proxy::SerializedHandle(
78 handle, sizeof(ppapi::ContentGamepadHardwareBuffer))); 78 handle, sizeof(ppapi::ContentGamepadHardwareBuffer)));
79 host()->SendReply(context, PpapiPluginMsg_Gamepad_SendMemory()); 79 host()->SendReply(context, PpapiPluginMsg_Gamepad_SendMemory());
80 } 80 }
81 81
82 } // namespace content 82 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698