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

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

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/common/mac/font_descriptor_unittest.mm ('k') | content/common/sandbox_mac.mm » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/native_library.h" 8 #include "base/native_library.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "content/public/common/content_client.h" 12 #include "content/public/common/content_client.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "ppapi/shared_impl/ppapi_permissions.h" 14 #include "ppapi/shared_impl/ppapi_permissions.h"
15 15
16 namespace content { 16 namespace content {
17 namespace { 17 namespace {
18 18
19 // Appends any plugins from the command line to the given vector. 19 // Appends any plugins from the command line to the given vector.
20 void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) { 20 void ComputePluginsFromCommandLine(std::vector<PepperPluginInfo>* plugins) {
21 bool out_of_process = true; 21 bool out_of_process = true;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 if (!module->InitAsLibrary(current.path)) { 240 if (!module->InitAsLibrary(current.path)) {
241 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value(); 241 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
242 continue; 242 continue;
243 } 243 }
244 } 244 }
245 preloaded_modules_[current.path] = module; 245 preloaded_modules_[current.path] = module;
246 } 246 }
247 } 247 }
248 248
249 } // namespace content 249 } // namespace content
OLDNEW
« no previous file with comments | « content/common/mac/font_descriptor_unittest.mm ('k') | content/common/sandbox_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698