summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/common/pepper_plugin_registry.cc7
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc6
2 files changed, 12 insertions, 1 deletions
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index be7529d..4c688e2 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -137,6 +137,11 @@ void PepperPluginRegistry::PreloadModules() {
std::string error;
base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path,
&error);
+#if defined(OS_CHROMEOS)
+ // TODO(xiyuan): Remove this once crosbug.com/26646 is resolved.
+ LOG(ERROR) << "#### PepperPluginRegistry::PreloadModules"
+ << ", path=" << plugins[i].path.value();
+#endif // defined (OS_CHROMEOS)
DLOG_IF(WARNING, !library) << "Unable to load plugin "
<< plugins[i].path.value() << " "
<< error;
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 746e515..68d92e4 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -444,6 +444,12 @@ PluginModule::PluginModule(const std::string& name,
name_(name),
path_(path),
reserve_instance_id_(NULL) {
+#if defined(OS_CHROMEOS)
+ // TODO(xiyuan): Remove this once crosbug.com/26646 is resolved.
+ LOG(ERROR) << "#### Create ppapi::PluginModule::PluginModule"
+ << ", name=" << name
+ << ", path=" << path.value();
+#endif // defined (OS_CHROMEOS)
// Ensure the globals object is created.
if (!host_globals)
host_globals = new HostGlobals;