| Index: webkit/plugins/ppapi/plugin_module.cc
|
| diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
|
| index 68d92e4ec3c7135e93fc5879792d119a728a8242..ba0f3c50e5210d65d5b2eab4da509b0c15d1762d 100644
|
| --- a/webkit/plugins/ppapi/plugin_module.cc
|
| +++ b/webkit/plugins/ppapi/plugin_module.cc
|
| @@ -495,6 +495,11 @@ PluginModule::~PluginModule() {
|
| }
|
|
|
| bool PluginModule::InitAsInternalPlugin(const EntryPoints& entry_points) {
|
| +#if defined(OS_CHROMEOS)
|
| + // TODO(oshima): Remove this once crosbug.com/26646 is resolved.
|
| + LOG(ERROR) << "#### PluginModule::InitAsInternalPlugin name=" << name_;
|
| +#endif // defined (OS_CHROMEOS)
|
| +
|
| if (InitializeModule(entry_points)) {
|
| entry_points_ = entry_points;
|
| return true;
|
| @@ -503,7 +508,17 @@ bool PluginModule::InitAsInternalPlugin(const EntryPoints& entry_points) {
|
| }
|
|
|
| bool PluginModule::InitAsLibrary(const FilePath& path) {
|
| +#if defined(OS_CHROMEOS)
|
| + // TODO(oshima): Remove this once crosbug.com/26646 is resolved.
|
| + LOG(ERROR) << "#### PluginModule::InitAsLibrary name=" << name_;
|
| +#endif // defined (OS_CHROMEOS)
|
| +
|
| base::NativeLibrary library = base::LoadNativeLibrary(path, NULL);
|
| +#if defined(OS_CHROMEOS)
|
| + // TODO(oshima): Remove this once crosbug.com/26646 is resolved.
|
| + LOG(ERROR) << "#### PluginModule::InitAsLibrary loaded";
|
| +#endif // defined (OS_CHROMEOS)
|
| +
|
| if (!library)
|
| return false;
|
|
|
| @@ -521,6 +536,11 @@ bool PluginModule::InitAsLibrary(const FilePath& path) {
|
|
|
| void PluginModule::InitAsProxied(
|
| PluginDelegate::OutOfProcessProxy* out_of_process_proxy) {
|
| +#if defined(OS_CHROMEOS)
|
| + // TODO(oshima): Remove this once crosbug.com/26646 is resolved.
|
| + LOG(ERROR) << "#### PluginModule::InitAsProxied name=" << name_;
|
| +#endif // defined (OS_CHROMEOS)
|
| +
|
| DCHECK(!out_of_process_proxy_.get());
|
| out_of_process_proxy_.reset(out_of_process_proxy);
|
| }
|
| @@ -621,6 +641,11 @@ bool PluginModule::InitializeModule(const EntryPoints& entry_points) {
|
| DCHECK(!out_of_process_proxy_.get()) << "Don't call for proxied modules.";
|
| DCHECK(entry_points.initialize_module != NULL);
|
| int retval = entry_points.initialize_module(pp_module(), &GetInterface);
|
| +#if defined(OS_CHROMEOS)
|
| + // TODO(oshima): Remove this once crosbug.com/26646 is resolved.
|
| + LOG(ERROR) << "#### PluginModule::InitModule result=" << retval;
|
| +#endif // defined (OS_CHROMEOS)
|
| +
|
| if (retval != 0) {
|
| LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
|
| return false;
|
|
|