diff options
author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 21:39:04 +0000 |
---|---|---|
committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 21:39:04 +0000 |
commit | 28ab7f9770e0096536e5277c62f5463625f152bd (patch) | |
tree | fd7db6edfb8ad20a39944ac3d438d2ca4738c1fb /chrome/plugin | |
parent | d7bb1f68d48f5939c9579fbfacd82389096b776c (diff) | |
download | chromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.zip chromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.tar.gz chromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.tar.bz2 |
Change "dll" to "plugin" where appropriate.
Review URL: http://codereview.chromium.org/16543
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r-- | chrome/plugin/plugin_main.cc | 6 | ||||
-rw-r--r-- | chrome/plugin/plugin_process.h | 2 | ||||
-rw-r--r-- | chrome/plugin/plugin_thread.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index b925a01..94f50bc 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -32,11 +32,11 @@ int PluginMain(CommandLine &parsed_command_line, bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox) || !parsed_command_line.HasSwitch(switches::kSafePlugins); if (target_services && !no_sandbox) { - // The command line might specify a test dll to load. + // The command line might specify a test plugin to load. if (parsed_command_line.HasSwitch(switches::kTestSandbox)) { - std::wstring test_dll_name = + std::wstring test_plugin_name = parsed_command_line.GetSwitchValue(switches::kTestSandbox); - sandbox_test_module = LoadLibrary(test_dll_name.c_str()); + sandbox_test_module = LoadLibrary(test_plugin_name.c_str()); DCHECK(sandbox_test_module); } } diff --git a/chrome/plugin/plugin_process.h b/chrome/plugin/plugin_process.h index c7c0b78..ca80722 100644 --- a/chrome/plugin/plugin_process.h +++ b/chrome/plugin/plugin_process.h @@ -25,7 +25,7 @@ class PluginProcess : public ChildProcess { // from the browser. static void BrowserShutdown(); - // File path of the plugin dll this process hosts. + // File path of the plugin this process hosts. const FilePath& plugin_path() { return plugin_path_; } private: diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index e9c1ecd..8b8c20e 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -75,7 +75,7 @@ void PluginThread::Init() { notification_service_.reset(new NotificationService); resource_dispatcher_ = new ResourceDispatcher(this); - // Preload the dll to avoid loading, unloading then reloading + // Preload the library to avoid loading, unloading then reloading preloaded_plugin_module_ = NPAPI::PluginLib::LoadPluginHelper( plugin_process_->plugin_path()); |