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

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

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/npobject_stub.cc ('k') | content/common/sandbox_init_wrapper_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"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "content/common/content_client.h" 13 #include "content/common/content_client.h"
14 #include "content/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "webkit/plugins/npapi/plugin_list.h" 15 #include "webkit/plugins/npapi/plugin_list.h"
16 16
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 = 21 bool out_of_process =
22 CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiOutOfProcess); 22 CommandLine::ForCurrentProcess()->HasSwitch(switches::kPpapiOutOfProcess);
23 const std::string value = 23 const std::string value =
24 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 24 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // Preload all external plugins we're not running out of process. 231 // Preload all external plugins we're not running out of process.
232 if (!module->InitAsLibrary(current.path)) { 232 if (!module->InitAsLibrary(current.path)) {
233 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value(); 233 DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
234 continue; 234 continue;
235 } 235 }
236 } 236 }
237 preloaded_modules_[current.path] = module; 237 preloaded_modules_[current.path] = module;
238 } 238 }
239 } 239 }
240 240
OLDNEW
« no previous file with comments | « content/common/npobject_stub.cc ('k') | content/common/sandbox_init_wrapper_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698