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

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

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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
« no previous file with comments | « chrome/common/extensions/url_pattern.cc ('k') | chrome/common/zip.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/common/pepper_plugin_registry.h" 5 #include "chrome/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/path_service.h" 10 #include "base/path_service.h"
11 #include "base/string_split.h"
11 #include "base/string_util.h" 12 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
13 #include "chrome/common/chrome_paths.h" 14 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
15 #include "remoting/client/plugin/pepper_entrypoints.h" 16 #include "remoting/client/plugin/pepper_entrypoints.h"
16 17
17 PepperPluginInfo::PepperPluginInfo() : is_internal(false) { 18 PepperPluginInfo::PepperPluginInfo() : is_internal(false) {
18 } 19 }
19 20
20 // static 21 // static
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 for (size_t i = 0; i < plugins.size(); ++i) { 194 for (size_t i = 0; i < plugins.size(); ++i) {
194 const FilePath& path = plugins[i].path; 195 const FilePath& path = plugins[i].path;
195 ModuleHandle module = pepper::PluginModule::CreateModule(path); 196 ModuleHandle module = pepper::PluginModule::CreateModule(path);
196 if (!module) { 197 if (!module) {
197 DLOG(ERROR) << "Failed to load pepper module: " << path.value(); 198 DLOG(ERROR) << "Failed to load pepper module: " << path.value();
198 continue; 199 continue;
199 } 200 }
200 modules_[path] = module; 201 modules_[path] = module;
201 } 202 }
202 } 203 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/url_pattern.cc ('k') | chrome/common/zip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698