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

Side by Side Diff: content/common/pepper_plugin_registry.cc

Issue 8416055: Convert some non-debug logging on content/common to debug logging. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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
« no previous file with comments | « content/common/npobject_stub.cc ('k') | content/common/process_watcher_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/pepper_plugin_registry.h" 5 #include "content/common/pepper_plugin_registry.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/native_library.h" 9 #include "base/native_library.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 // static 129 // static
130 void PepperPluginRegistry::PreloadModules() { 130 void PepperPluginRegistry::PreloadModules() {
131 std::vector<content::PepperPluginInfo> plugins; 131 std::vector<content::PepperPluginInfo> plugins;
132 ComputeList(&plugins); 132 ComputeList(&plugins);
133 for (size_t i = 0; i < plugins.size(); ++i) { 133 for (size_t i = 0; i < plugins.size(); ++i) {
134 if (!plugins[i].is_internal) { 134 if (!plugins[i].is_internal) {
135 std::string error; 135 std::string error;
136 base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path, 136 base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path,
137 &error); 137 &error);
138 LOG_IF(WARNING, !library) << "Unable to load plugin " 138 DLOG_IF(WARNING, !library) << "Unable to load plugin "
139 << plugins[i].path.value() << " " 139 << plugins[i].path.value() << " "
140 << error; 140 << error;
141 (void)library; // Prevent release-mode warning.
141 } 142 }
142 } 143 }
143 } 144 }
144 145
145 const content::PepperPluginInfo* PepperPluginRegistry::GetInfoForPlugin( 146 const content::PepperPluginInfo* PepperPluginRegistry::GetInfoForPlugin(
146 const webkit::WebPluginInfo& info) { 147 const webkit::WebPluginInfo& info) {
147 for (size_t i = 0; i < plugin_list_.size(); ++i) { 148 for (size_t i = 0; i < plugin_list_.size(); ++i) {
148 if (info.path == plugin_list_[i].path) 149 if (info.path == plugin_list_[i].path)
149 return &plugin_list_[i]; 150 return &plugin_list_[i];
150 } 151 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // Preload all external plugins we're not running out of process. 226 // Preload all external plugins we're not running out of process.
226 if (!module->InitAsLibrary(current.path)) { 227 if (!module->InitAsLibrary(current.path)) {
227 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value(); 228 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
228 continue; 229 continue;
229 } 230 }
230 } 231 }
231 preloaded_modules_[current.path] = module; 232 preloaded_modules_[current.path] = module;
232 } 233 }
233 } 234 }
234 235
OLDNEW
« no previous file with comments | « content/common/npobject_stub.cc ('k') | content/common/process_watcher_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698