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

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

Issue 12086077: Only permit plug-in loads in the browser if the plug-in isn't blocked or the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | 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/pepper_flash_settings_helper_impl.h" 5 #include "content/browser/pepper_flash_settings_helper_impl.h"
6 6
7 #include "base/file_path.h" 7 #include "base/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 20 matching lines...) Expand all
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(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(
(...skipping 11 matching lines...) Expand all
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

Powered by Google App Engine
This is Rietveld 408576698