OLD | NEW |
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/pepper_flash_settings_helper_impl.h" | 5 #include "content/browser/pepper_flash_settings_helper_impl.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "content/browser/plugin_service_impl.h" | 8 #include "content/browser/plugin_service_impl.h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "ipc/ipc_channel_handle.h" | 10 #include "ipc/ipc_channel_handle.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 *renderer_id = 0; | 48 *renderer_id = 0; |
49 } | 49 } |
50 | 50 |
51 void PepperFlashSettingsHelperImpl::OnPpapiChannelOpened( | 51 void PepperFlashSettingsHelperImpl::OnPpapiChannelOpened( |
52 const IPC::ChannelHandle& channel_handle, | 52 const IPC::ChannelHandle& channel_handle, |
53 base::ProcessId /* plugin_pid */, | 53 base::ProcessId /* plugin_pid */, |
54 int /* plugin_child_id */) { | 54 int /* plugin_child_id */) { |
55 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 55 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
56 DCHECK(!callback_.is_null()); | 56 DCHECK(!callback_.is_null()); |
57 | 57 |
58 if (!channel_handle.name.empty()) | 58 if (channel_handle.mojo_handle.is_valid()) |
59 callback_.Run(true, channel_handle); | 59 callback_.Run(true, channel_handle); |
60 else | 60 else |
61 callback_.Run(false, IPC::ChannelHandle()); | 61 callback_.Run(false, IPC::ChannelHandle()); |
62 | 62 |
63 callback_.Reset(); | 63 callback_.Reset(); |
64 // Balance the AddRef() call in Initialize(). | 64 // Balance the AddRef() call in Initialize(). |
65 Release(); | 65 Release(); |
66 } | 66 } |
67 | 67 |
68 bool PepperFlashSettingsHelperImpl::OffTheRecord() { | 68 bool PepperFlashSettingsHelperImpl::OffTheRecord() { |
69 return false; | 69 return false; |
70 } | 70 } |
71 | 71 |
72 } // namespace content | 72 } // namespace content |
OLD | NEW |