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

Side by Side Diff: content/browser/pepper_flash_settings_helper_impl.cc

Issue 1000373002: favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 9 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
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/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"
11 11
12 namespace content { 12 namespace content {
13 13
14 // static 14 // static
15 scoped_refptr<PepperFlashSettingsHelper> PepperFlashSettingsHelper::Create() { 15 scoped_refptr<PepperFlashSettingsHelper> PepperFlashSettingsHelper::Create() {
16 return new PepperFlashSettingsHelperImpl(); 16 return new PepperFlashSettingsHelperImpl();
17 } 17 }
18 18
19 PepperFlashSettingsHelperImpl::PepperFlashSettingsHelperImpl() { 19 PepperFlashSettingsHelperImpl::PepperFlashSettingsHelperImpl() {
20 } 20 }
21 21
22 PepperFlashSettingsHelperImpl::~PepperFlashSettingsHelperImpl() { 22 PepperFlashSettingsHelperImpl::~PepperFlashSettingsHelperImpl() {
23 } 23 }
24 24
25 void PepperFlashSettingsHelperImpl::OpenChannelToBroker( 25 void PepperFlashSettingsHelperImpl::OpenChannelToBroker(
26 const base::FilePath& path, 26 const base::FilePath& path,
27 const OpenChannelCallback& callback) { 27 const OpenChannelCallback& callback) {
28 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 28 DCHECK_CURRENTLY_ON(BrowserThread::IO);
29 29
30 if (callback.is_null()) 30 if (callback.is_null())
31 return; 31 return;
32 if (!callback_.is_null()) 32 if (!callback_.is_null())
33 callback.Run(false, IPC::ChannelHandle()); 33 callback.Run(false, IPC::ChannelHandle());
34 34
35 // Balanced in OnPpapiChannelOpened(). We need to keep this object around 35 // Balanced in OnPpapiChannelOpened(). We need to keep this object around
36 // until then. 36 // until then.
37 AddRef(); 37 AddRef();
38 38
39 callback_ = callback; 39 callback_ = callback;
40 PluginServiceImpl* plugin_service = PluginServiceImpl::GetInstance(); 40 PluginServiceImpl* plugin_service = PluginServiceImpl::GetInstance();
41 plugin_service->OpenChannelToPpapiBroker(0, path, this); 41 plugin_service->OpenChannelToPpapiBroker(0, path, this);
42 } 42 }
43 43
44 void PepperFlashSettingsHelperImpl::GetPpapiChannelInfo( 44 void PepperFlashSettingsHelperImpl::GetPpapiChannelInfo(
45 base::ProcessHandle* renderer_handle, 45 base::ProcessHandle* renderer_handle,
46 int* renderer_id) { 46 int* renderer_id) {
47 *renderer_handle = base::kNullProcessHandle; 47 *renderer_handle = base::kNullProcessHandle;
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(BrowserThread::CurrentlyOn(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.name.empty())
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
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_internals_message_handler.cc ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698