OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/plugin_loader_posix.h" | 5 #include "content/browser/plugin_loader_posix.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 | 94 |
95 process_host_ = new UtilityProcessHost(this, BrowserThread::IO); | 95 process_host_ = new UtilityProcessHost(this, BrowserThread::IO); |
96 process_host_->set_no_sandbox(true); | 96 process_host_->set_no_sandbox(true); |
97 #if defined(OS_MACOSX) | 97 #if defined(OS_MACOSX) |
98 process_host_->set_child_flags(ChildProcessHost::CHILD_ALLOW_HEAP_EXECUTION); | 98 process_host_->set_child_flags(ChildProcessHost::CHILD_ALLOW_HEAP_EXECUTION); |
99 #endif | 99 #endif |
100 | 100 |
101 process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_)); | 101 process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_)); |
102 } | 102 } |
103 | 103 |
104 void PluginLoaderPosix::OnPluginLoaded(uint32_t index, | 104 void PluginLoaderPosix::OnPluginLoaded(uint32 index, |
105 const webkit::WebPluginInfo& plugin) { | 105 const webkit::WebPluginInfo& plugin) { |
106 if (index != next_load_index_) { | 106 if (index != next_load_index_) { |
107 LOG(ERROR) << "Received unexpected plugin load message for " | 107 LOG(ERROR) << "Received unexpected plugin load message for " |
108 << plugin.path.value() << "; index=" << index; | 108 << plugin.path.value() << "; index=" << index; |
109 return; | 109 return; |
110 } | 110 } |
111 | 111 |
112 if (!MaybeAddInternalPlugin(plugin.path)) | 112 if (!MaybeAddInternalPlugin(plugin.path)) |
113 loaded_plugins_.push_back(plugin); | 113 loaded_plugins_.push_back(plugin); |
114 | 114 |
115 ++next_load_index_; | 115 ++next_load_index_; |
116 | 116 |
117 MaybeRunPendingCallbacks(); | 117 MaybeRunPendingCallbacks(); |
118 } | 118 } |
119 | 119 |
120 void PluginLoaderPosix::OnPluginLoadFailed(uint32_t index, | 120 void PluginLoaderPosix::OnPluginLoadFailed(uint32 index, |
121 const FilePath& plugin_path) { | 121 const FilePath& plugin_path) { |
122 if (index != next_load_index_) { | 122 if (index != next_load_index_) { |
123 LOG(ERROR) << "Received unexpected plugin load failure message for " | 123 LOG(ERROR) << "Received unexpected plugin load failure message for " |
124 << plugin_path.value() << "; index=" << index; | 124 << plugin_path.value() << "; index=" << index; |
125 return; | 125 return; |
126 } | 126 } |
127 | 127 |
128 ++next_load_index_; | 128 ++next_load_index_; |
129 | 129 |
130 MaybeAddInternalPlugin(plugin_path); | 130 MaybeAddInternalPlugin(plugin_path); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 | 168 |
169 PluginLoaderPosix::PendingCallback::PendingCallback( | 169 PluginLoaderPosix::PendingCallback::PendingCallback( |
170 scoped_refptr<base::MessageLoopProxy> loop, | 170 scoped_refptr<base::MessageLoopProxy> loop, |
171 const PluginService::GetPluginsCallback& cb) | 171 const PluginService::GetPluginsCallback& cb) |
172 : target_loop(loop), | 172 : target_loop(loop), |
173 callback(cb) { | 173 callback(cb) { |
174 } | 174 } |
175 | 175 |
176 PluginLoaderPosix::PendingCallback::~PendingCallback() { | 176 PluginLoaderPosix::PendingCallback::~PendingCallback() { |
177 } | 177 } |
OLD | NEW |