diff options
| author | tommycli <tommycli@chromium.org> | 2015-03-16 13:16:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-16 20:17:22 +0000 |
| commit | e86b2982a90cc87afbeb8599cc54c274c482b0ec (patch) | |
| tree | 2d02def47398f16fa93aea38e66448af48bec4ee | |
| parent | 8f7612681b0b45c99010e90d5a0b7c1d80d9de8d (diff) | |
| download | chromium_src-e86b2982a90cc87afbeb8599cc54c274c482b0ec.zip chromium_src-e86b2982a90cc87afbeb8599cc54c274c482b0ec.tar.gz chromium_src-e86b2982a90cc87afbeb8599cc54c274c482b0ec.tar.bz2 | |
Plugin Power Saver: Replace all "plug-in" with "plugin" for consistency.
Passed chrome-ui-review: https://groups.google.com/a/google.com/d/msg/chrome-ui-review/FwuQ2TWc5n8/H3PSuV4L_cAJ
BUG=467165
TBR=tsepez
(comment changes only in render_messages)
NOPRESUBMIT=true
(legacy LOG messages)
Review URL: https://codereview.chromium.org/1007443004
Cr-Commit-Position: refs/heads/master@{#320782}
126 files changed, 428 insertions, 428 deletions
diff --git a/build/common.gypi b/build/common.gypi index 515f50a..0b9f1df 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -581,7 +581,7 @@ # Use experimental lld linker instead of the platform's default linker. 'use_lld%': 0, - # Enable plug-in installation by default. + # Enable plugin installation by default. 'enable_plugin_installation%': 1, # Specifies whether to use canvas_skia.cc in place of platform diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index efe2b2f..dae424d 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -247,10 +247,10 @@ be available for now. --> https://support.google.com/chrome/?p=ib_chromeframe </message> <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Chromium Frame turndown prompt for IE 6, 7, and 8"> - This site is using the Chromium Frame plug-in which will soon be unsupported. Please uninstall it and upgrade to a modern browser. + This site is using the Chromium Frame plugin which will soon be unsupported. Please uninstall it and upgrade to a modern browser. </message> <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Chromium Frame turndown prompt for IE 9 and 10"> - This site is using the Chromium Frame plug-in that will soon be unsupported. Please uninstall it and download a compatible browser. + This site is using the Chromium Frame plugin that will soon be unsupported. Please uninstall it and download a compatible browser. </message> <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> New window diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index f014298..f30aff9 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -1124,18 +1124,18 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may <if expr="not use_titlecase"> <message name="IDS_CONTENT_CONTEXT_PLUGIN_RUN" desc="The name of the Run command on the blocked plugin context menu"> - Run this plug-in + Run this plugin </message> <message name="IDS_CONTENT_CONTEXT_PLUGIN_HIDE" desc="The name of the Hide command on the blocked plugin context menu"> - Hide this plug-in + Hide this plugin </message> </if> <if expr="use_titlecase"> <message name="IDS_CONTENT_CONTEXT_PLUGIN_RUN" desc="In Title Case: The name of the Run command on the blocked plugin context menu"> - Run This Plug-in + Run This Plugin </message> <message name="IDS_CONTENT_CONTEXT_PLUGIN_HIDE" desc="In Title Case: The name of the Hide command on the blocked plugin context menu"> - Hide This Plug-in + Hide This Plugin </message> </if> @@ -2675,7 +2675,7 @@ Even if you have downloaded files from this website before, the website might ha Pop-up blocked </message> <message name="IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT" desc="Explanatory animated text that appears (and then disappears) in the address line when plugin is blocked"> - Plug-in blocked + Plugin blocked </message> <message name="IDS_BLOCKED_JAVASCRIPT_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to run JavaScript."> JavaScript was blocked on this page. @@ -2689,28 +2689,28 @@ Even if you have downloaded files from this website before, the website might ha <message name="IDS_BLOCKED_JAVASCRIPT_LINK" desc="Link to JavaScript section of content blocking management dialog, displayed in bubble when a page tries to run JavaScript."> Manage JavaScript blocking... </message> - <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to display plug-ins."> - The following plug-ins were blocked on this page: + <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to display plugins."> + The following plugins were blocked on this page: </message> - <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip and message when a page is not allowed to display plug-ins."> - Plug-ins were blocked on this page. + <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip and message when a page is not allowed to display plugins."> + Plugins were blocked on this page. </message> - <message name="IDS_BLOCKED_PLUGINS_UNBLOCK_ALL" desc="Radio button choice to unblock a site from using plug-ins, displayed in bubble when a page tries to use plug-ins."> - Always allow plug-ins on <ph name="HOST">$1<ex>mail.google.com</ex></ph> + <message name="IDS_BLOCKED_PLUGINS_UNBLOCK_ALL" desc="Radio button choice to unblock a site from using plugins, displayed in bubble when a page tries to use plugins."> + Always allow plugins on <ph name="HOST">$1<ex>mail.google.com</ex></ph> </message> <if expr="is_macosx"> - <message name="IDS_BLOCKED_PLUGINS_UNBLOCK" desc="Radio button choice to unblock a site from using *a specific set* of plug-ins, displayed in bubble when a page tries to use plug-ins."> - Always allow these plug-ins on <ph name="HOST">$1<ex>mail.google.com</ex></ph> + <message name="IDS_BLOCKED_PLUGINS_UNBLOCK" desc="Radio button choice to unblock a site from using *a specific set* of plugins, displayed in bubble when a page tries to use plugins."> + Always allow these plugins on <ph name="HOST">$1<ex>mail.google.com</ex></ph> </message> </if> - <message name="IDS_BLOCKED_PLUGINS_NO_ACTION" desc="Radio button choice to continue blocking a site from using plug-ins, displayed in bubble when a page tries to use plug-ins."> - Continue blocking plug-ins + <message name="IDS_BLOCKED_PLUGINS_NO_ACTION" desc="Radio button choice to continue blocking a site from using plugins, displayed in bubble when a page tries to use plugins."> + Continue blocking plugins </message> - <message name="IDS_BLOCKED_PLUGINS_LINK" desc="Link to plug-ins section of content blocking management dialog, displayed in bubble when a page tries to display plug-ins."> - Manage plug-in blocking... + <message name="IDS_BLOCKED_PLUGINS_LINK" desc="Link to plugins section of content blocking management dialog, displayed in bubble when a page tries to display plugins."> + Manage plugin blocking... </message> - <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all blocked plugins on a page, displayed in bubble when a page tries to display plug-ins."> - Run all plug-ins this time + <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all blocked plugins on a page, displayed in bubble when a page tries to display plugins."> + Run all plugins this time </message> <!-- Certificate error strings --> @@ -3900,16 +3900,16 @@ Even if you have downloaded files from this website before, the website might ha Background Page: <ph name="BACKGROUND_PAGE_URL">$1<ex>http://www.google.com</ex></ph> </message> <message name="IDS_TASK_MANAGER_PLUGIN_PREFIX" desc="The prefix for a Task Manager plugin row"> - Plug-in: <ph name="PLUGIN_NAME">$1<ex>Unknown Plug-in</ex></ph> + Plugin: <ph name="PLUGIN_NAME">$1<ex>Unknown Plugin</ex></ph> </message> <message name="IDS_TASK_MANAGER_PLUGIN_BROKER_PREFIX" desc="Task Manager row for PPAPI plugin broker, which provides additional access for PPAPI plugins"> - Plug-in Broker: <ph name="PLUGIN_NAME">$1<ex>Unknown Plug-in</ex></ph> + Plugin Broker: <ph name="PLUGIN_NAME">$1<ex>Unknown Plugin</ex></ph> </message> <message name="IDS_TASK_MANAGER_PRERENDER_PREFIX" desc="The prefix for a Task Manager prerender row"> Prerender: <ph name="PRERENDER_CONTENTS_NAME">$1<ex>http://www.google.com</ex></ph> </message> <message name="IDS_TASK_MANAGER_UNKNOWN_PLUGIN_NAME" desc="The prefix for a Task Manager plugin row"> - Unknown plug-in + Unknown plugin </message> <message name="IDS_TASK_MANAGER_WORKER_PREFIX" desc="The prefix for a Task Manager HTML5 Web Worker process row"> Web Worker: <ph name="WORKER_NAME">$1<ex>http://www.domain.com</ex></ph> @@ -4632,7 +4632,7 @@ Even if you have downloaded files from this website before, the website might ha Read all text spoken using synthesized speech </message> <message name="IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS" desc="Permission string for access to content settings."> - Change your settings that control websites' access to features such as cookies, JavaScript, plug-ins, geolocation, microphone, camera etc. + Change your settings that control websites' access to features such as cookies, JavaScript, plugins, geolocation, microphone, camera etc. </message> <message name="IDS_EXTENSION_PROMPT_WARNING_PRIVACY" desc="Permission string for access to privacy settings."> Change your privacy-related settings @@ -5561,63 +5561,63 @@ Keep your key file in a safe place. You will need it to create new versions of y <!-- Plugins --> <if expr="enable_plugins"> <message name="IDS_PLUGINS_TITLE" desc="Title for the chrome://plugins page."> - Plug-ins + Plugins </message> <message name="IDS_PLUGINS_DETAILS_MODE_LINK" desc="Text of the link for details mode."> Details </message> - <message name="IDS_PLUGINS_NONE_INSTALLED" desc="Text that lets the user know that no plug-ins are installed."> - No plug-ins installed. + <message name="IDS_PLUGINS_NONE_INSTALLED" desc="Text that lets the user know that no plugins are installed."> + No plugins installed. </message> - <message name="IDS_PLUGINS_DISABLED_PLUGIN" desc="Text that signifies that the plug-in is currently disabled."> + <message name="IDS_PLUGINS_DISABLED_PLUGIN" desc="Text that signifies that the plugin is currently disabled."> (Disabled) </message> - <message name="IDS_PLUGINS_DISABLED_BY_POLICY_PLUGIN" desc="Text that signifies that the plug-in is currently disabled by enterprise policy."> + <message name="IDS_PLUGINS_DISABLED_BY_POLICY_PLUGIN" desc="Text that signifies that the plugin is currently disabled by enterprise policy."> (Disabled by enterprise policy) </message> - <message name="IDS_PLUGINS_ENABLED_BY_POLICY_PLUGIN" desc="Text that signifies that the plug-in is currently enabled by enterprise policy."> + <message name="IDS_PLUGINS_ENABLED_BY_POLICY_PLUGIN" desc="Text that signifies that the plugin is currently enabled by enterprise policy."> (Enabled by enterprise policy) </message> - <message name="IDS_PLUGINS_GROUP_MANAGED_BY_POLICY" desc="Text that signifies that the plug-in group is currently managed by enterprise policy."> + <message name="IDS_PLUGINS_GROUP_MANAGED_BY_POLICY" desc="Text that signifies that the plugin group is currently managed by enterprise policy."> (Managed by enterprise policy) </message> - <message name="IDS_PLUGINS_VERSION" desc="The label in front of a plug-in version number."> + <message name="IDS_PLUGINS_VERSION" desc="The label in front of a plugin version number."> Version: </message> - <message name="IDS_PLUGINS_DESCRIPTION" desc="The label in front of a plug-in description."> + <message name="IDS_PLUGINS_DESCRIPTION" desc="The label in front of a plugin description."> Description: </message> - <message name="IDS_PLUGINS_PATH" desc="The label in front of a plug-in path (file/location on disk)."> + <message name="IDS_PLUGINS_PATH" desc="The label in front of a plugin path (file/location on disk)."> Location: </message> - <message name="IDS_PLUGINS_TYPE" desc="The label in front of a plug-in type (NPAPI, PPAPI, etc.)."> + <message name="IDS_PLUGINS_TYPE" desc="The label in front of a plugin type (NPAPI, PPAPI, etc.)."> Type: </message> - <message name="IDS_PLUGINS_MIME_TYPES" desc="The label in front of a plug-in's MIME types table."> + <message name="IDS_PLUGINS_MIME_TYPES" desc="The label in front of a plugin's MIME types table."> MIME types: </message> - <message name="IDS_PLUGINS_MIME_TYPES_MIME_TYPE" desc="The label over the MIME type column in a plug-in's MIME types table."> + <message name="IDS_PLUGINS_MIME_TYPES_MIME_TYPE" desc="The label over the MIME type column in a plugin's MIME types table."> MIME type </message> - <message name="IDS_PLUGINS_MIME_TYPES_DESCRIPTION" desc="The label over the description column in a plug-in's MIME types table."> + <message name="IDS_PLUGINS_MIME_TYPES_DESCRIPTION" desc="The label over the description column in a plugin's MIME types table."> Description </message> - <message name="IDS_PLUGINS_MIME_TYPES_FILE_EXTENSIONS" desc="The label over the file extensions column in a plug-in's MIME types table."> + <message name="IDS_PLUGINS_MIME_TYPES_FILE_EXTENSIONS" desc="The label over the file extensions column in a plugin's MIME types table."> File extensions </message> - <message name="IDS_PLUGINS_DISABLE" desc="The link for disabling a plug-in."> + <message name="IDS_PLUGINS_DISABLE" desc="The link for disabling a plugin."> Disable </message> - <message name="IDS_PLUGINS_ENABLE" desc="The link for enabling a plug-in."> + <message name="IDS_PLUGINS_ENABLE" desc="The link for enabling a plugin."> Enable </message> - <message name="IDS_PLUGINS_ALWAYS_ALLOWED" desc="The checkbox label for whitelisting a plug-in for content settings."> + <message name="IDS_PLUGINS_ALWAYS_ALLOWED" desc="The checkbox label for whitelisting a plugin for content settings."> Always allowed to run </message> - <message name="IDS_PLUGINS_DOWNLOAD" desc="The link label to download the latest version of this plug-in"> + <message name="IDS_PLUGINS_DOWNLOAD" desc="The link label to download the latest version of this plugin"> Download Critical Security Update </message> - <message name="IDS_PLUGINS_NAME" desc="The label for the name of this plug-in"> + <message name="IDS_PLUGINS_NAME" desc="The label for the name of this plugin"> Name: </message> <message name="IDS_PLUGINS_NO_PLUGINS" desc="Text that indicates that no plugins are installed"> @@ -7037,7 +7037,7 @@ Keep your key file in a safe place. You will need it to create new versions of y This feature is temporarily unavailable. <ph name="BEGIN_LINK"><a target="_blank" href="$1"></ph>Help<ph name="END_LINK"></a><ex></a></ex></ph> </message> <message name="IDS_HOTWORD_NACL_DISABLED_ERROR_MESSAGE" desc="The error message text when hotwording fails because NaCl is disabled."> - <ph name="BEGIN_LINK"><a target="_blank" href="chrome://plugins"></ph>Native Client plug-in<ph name="END_LINK"></a><ex></a></ex></ph> needs to be enabled to use this feature. + <ph name="BEGIN_LINK"><a target="_blank" href="chrome://plugins"></ph>Native Client plugin<ph name="END_LINK"></a><ex></a></ex></ph> needs to be enabled to use this feature. </message> <message name="IDS_HOTWORD_MICROPHONE_ERROR_MESSAGE" desc="The error message text when hotwording fails because the microphone isn't working."> Microphone is currently unavailable. <ph name="BEGIN_LINK"><a target="_blank" href="chrome://settings/content#media-stream-settings"></ph>Manage microphone<ph name="END_LINK"></a><ex></a></ex></ph> @@ -7123,77 +7123,77 @@ Keep your key file in a safe place. You will need it to create new versions of y </if> </if> <!-- is_win --> - <!-- Plug-in placeholders --> - <message name="IDS_PLUGIN_HIDE" desc="The tooltip for hiding a blocked plug-in, displayed in the click to play UI."> - Hide this plug-in + <!-- Plugin placeholders --> + <message name="IDS_PLUGIN_HIDE" desc="The tooltip for hiding a blocked plugin, displayed in the click to play UI."> + Hide this plugin </message> - <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plug-in."> - Update plug-in... + <message name="IDS_PLUGIN_UPDATE" desc="The link for updating an outdated plugin."> + Update plugin... </message> - <message name="IDS_PLUGIN_NOT_SUPPORTED_METRO" desc="The placeholder text for a plug-in that can't run in Windows Metro mode."> - This plug-in only works on the desktop. + <message name="IDS_PLUGIN_NOT_SUPPORTED_METRO" desc="The placeholder text for a plugin that can't run in Windows Metro mode."> + This plugin only works on the desktop. </message> <if expr="is_macosx"> - <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plug-in."> + <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plugin."> Control-click to play <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>. </message> </if> <if expr="not is_macosx"> - <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plug-in."> + <message name="IDS_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plugin."> Right-click to play <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>. </message> </if> <if expr="chromeos"> - <message name="IDS_NACL_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plug-in."> + <message name="IDS_NACL_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plugin."> This app is not currently supported on this device but the Chrome gnomes are hard at work to make it work soon. </message> </if> - <message name="IDS_PLUGIN_OUTDATED" desc="The placeholder text for an outdated plug-in."> + <message name="IDS_PLUGIN_OUTDATED" desc="The placeholder text for an outdated plugin."> <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is out of date. </message> - <message name="IDS_PLUGIN_NOT_AUTHORIZED" desc="The placeholder text for a plug-in that requires user permission to run."> + <message name="IDS_PLUGIN_NOT_AUTHORIZED" desc="The placeholder text for a plugin that requires user permission to run."> <ph name="PLUGIN_NAME">$1<ex>Java</ex></ph> needs your permission to run. </message> - <message name="IDS_PLUGIN_NOT_SUPPORTED" desc="The placeholder text for an unsupported plug-in."> - This plug-in is not supported. + <message name="IDS_PLUGIN_NOT_SUPPORTED" desc="The placeholder text for an unsupported plugin."> + This plugin is not supported. </message> - <message name="IDS_PLUGIN_NOT_FOUND" desc="The placeholder text for an unknown plug-in that is not installed."> - No plug-in available to display this content. + <message name="IDS_PLUGIN_NOT_FOUND" desc="The placeholder text for an unknown plugin that is not installed."> + No plugin available to display this content. </message> - <message name="IDS_PLUGIN_SEARCHING" desc="The placeholder text when searching for a missing plug-in."> - Looking for plug-in... + <message name="IDS_PLUGIN_SEARCHING" desc="The placeholder text when searching for a missing plugin."> + Looking for plugin... </message> - <message name="IDS_PLUGIN_DOWNLOADING" desc="The placeholder text when downloading a missing plug-in."> + <message name="IDS_PLUGIN_DOWNLOADING" desc="The placeholder text when downloading a missing plugin."> Downloading <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph>... </message> - <message name="IDS_PLUGIN_DOWNLOAD_ERROR" desc="The placeholder text when there was an error download a missing plug-in."> - There was an error (<ph name="ERROR">$1<ex>net::ERR_TOO_MANY_GOATS</ex></ph>) while downloading the plug-in. + <message name="IDS_PLUGIN_DOWNLOAD_ERROR" desc="The placeholder text when there was an error download a missing plugin."> + There was an error (<ph name="ERROR">$1<ex>net::ERR_TOO_MANY_GOATS</ex></ph>) while downloading the plugin. </message> - <message name="IDS_PLUGIN_DOWNLOAD_ERROR_SHORT" desc="The placeholder text when there was an error download a missing plug-in."> + <message name="IDS_PLUGIN_DOWNLOAD_ERROR_SHORT" desc="The placeholder text when there was an error download a missing plugin."> <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph> download failed. </message> - <message name="IDS_PLUGIN_DOWNLOAD_CANCELLED" desc="The placeholder text when the user canceled downloading the plug-in."> + <message name="IDS_PLUGIN_DOWNLOAD_CANCELLED" desc="The placeholder text when the user canceled downloading the plugin."> <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph> download was canceled. </message> - <message name="IDS_PLUGIN_INSTALLING" desc="The placeholder text when installing a missing plug-in."> + <message name="IDS_PLUGIN_INSTALLING" desc="The placeholder text when installing a missing plugin."> When <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph> has finished installing, reload the page to activate it. </message> - <message name="IDS_PLUGIN_UPDATING" desc="The placeholder text when updating an out-of-date plug-in."> + <message name="IDS_PLUGIN_UPDATING" desc="The placeholder text when updating an out-of-date plugin."> When <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph> has finished updating, reload the page to activate it. </message> - <message name="IDS_PLUGIN_FOUND" desc="The placeholder text for a known plug-in that is not installed."> + <message name="IDS_PLUGIN_FOUND" desc="The placeholder text for a known plugin that is not installed."> <ph name="PLUGIN_NAME">$1<ex>Quicktime</ex></ph> is required to display this content. </message> - <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE" desc="Title of the plug-in installation confirmation dialog."> + <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE" desc="Title of the plugin installation confirmation dialog."> Install <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph> </message> - <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG" desc="Message of the plug-in installation confirmation dialog."> - Are you sure you want to install <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph>? You should only install plug-ins that you trust. + <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG" desc="Message of the plugin installation confirmation dialog."> + Are you sure you want to install <ph name="PLUGIN_NAME">$1<ex>Realplayer</ex></ph>? You should only install plugins that you trust. </message> - <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON" desc="Button title to install a missing plug-in."> + <message name="IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON" desc="Button title to install a missing plugin."> Install </message> - <message name="IDS_PLUGIN_DISABLED" desc="The placeholder text for a disabled plug-in."> + <message name="IDS_PLUGIN_DISABLED" desc="The placeholder text for a disabled plugin."> <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> has been disabled. To re-enable it, please go to <ph name="CHROME_PLUGINS_LINK">chrome://plugins</ph>. </message> @@ -7238,25 +7238,25 @@ Keep your key file in a safe place. You will need it to create new versions of y Deny </message> <message name="IDS_BLOCKED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper broker access was blocked"> - An unsandboxed plug-in was prevented from running on this page. + An unsandboxed plugin was prevented from running on this page. </message> <message name="IDS_ALLOWED_PPAPI_BROKER_TITLE" desc="Title for the page action when Pepper broker access was allowed"> - An unsandboxed plug-in was allowed to run running on this page. + An unsandboxed plugin was allowed to run running on this page. </message> <message name="IDS_BLOCKED_PPAPI_BROKER_UNBLOCK" desc="Radio button to unblock the Pepper broker"> - Always allow unsandboxed plug-ins on <ph name="HOST">$1<ex>example.com</ex></ph> + Always allow unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph> </message> <message name="IDS_BLOCKED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep blocking the Pepper broker"> - Continue blocking unsandboxed plug-ins + Continue blocking unsandboxed plugins </message> <message name="IDS_ALLOWED_PPAPI_BROKER_NO_ACTION" desc="Radio button to keep allowing the Pepper broker"> - Continue allowing unsandboxed plug-ins + Continue allowing unsandboxed plugins </message> <message name="IDS_ALLOWED_PPAPI_BROKER_BLOCK" desc="Radio button to block the Pepper broker"> - Never allow unsandboxed plug-ins on <ph name="HOST">$1<ex>example.com</ex></ph> + Never allow unsandboxed plugins on <ph name="HOST">$1<ex>example.com</ex></ph> </message> <message name="IDS_PPAPI_BROKER_BUBBLE_MANAGE_LINK" desc="Link title to manage Pepper broker settings"> - Manage unsandboxed plug-in blocking... + Manage unsandboxed plugin blocking... </message> <!-- Blocked Displaying/Running Insecure Content info bar --> @@ -7607,10 +7607,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Unknown </message> <message name="IDS_BROWSER_HANGMONITOR_TITLE" desc="Title for the hung plugin message"> - Plug-in Unresponsive + Plugin Unresponsive </message> <message name="IDS_BROWSER_HANGMONITOR" desc="A plugin on a page has hung"> - The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 + The following plugin is unresponsive: <ph name="PLUGIN_NAME">$1 <ex>Shockwave </ex></ph>Would you like to stop it? </message> @@ -7628,10 +7628,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Kill pages </message> <message name="IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR" desc="The text of the infobar notifying the user that a plugin has hung"> - A plug-in (<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>) isn't responding. + A plugin (<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>) isn't responding. </message> <message name="IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON" desc="The button on the hung plugin infobar (...PLUGIN_INFOBAR above) to terminate the plugin"> - Stop plug-in + Stop plugin </message> <!-- Passwords and Exceptions Dialog --> @@ -7915,7 +7915,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Cookies and other site data </message> <message name="IDS_DEL_COOKIES_FLASH_CHKBOX" desc="Checkbox for deleting Cookies and other site data"> - Cookies and other site and plug-in data + Cookies and other site and plugin data </message> <message name="IDS_DEL_PASSWORDS_CHKBOX" desc="Checkbox for deleting Passwords"> Passwords @@ -8120,7 +8120,7 @@ I don't think this site should be blocked! Clear cookies and other site data when you close your browser </message> <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed."> - Clear cookies and other site and plug-in data when you close your browser + Clear cookies and other site and plugin data when you close your browser </message> </if> <if expr="is_macosx"> @@ -8128,7 +8128,7 @@ I don't think this site should be blocked! Clear cookies and other site data when you quit your browser </message> <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is quit (Mac)."> - Clear cookies and other site and plug-in data when you quit your browser + Clear cookies and other site and plugin data when you quit your browser </message> </if> <if expr="chromeos"> @@ -8136,7 +8136,7 @@ I don't think this site should be blocked! Clear cookies and other site data when you log out </message> <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed."> - Clear cookies and other site and plug-in data when you log out + Clear cookies and other site and plugin data when you log out </message> </if> @@ -8172,23 +8172,23 @@ I don't think this site should be blocked! Pop-ups blocked (<ph name="POP_UP_COUNT">$1<ex>3</ex></ph>) </message> </if> - <message name="IDS_PLUGIN_TAB_LABEL" desc="Label for Plug-ins tab on Content Settings dialog"> - Plug-ins + <message name="IDS_PLUGIN_TAB_LABEL" desc="Label for Plugins tab on Content Settings dialog"> + Plugins </message> <message name="IDS_PLUGIN_HEADER" desc="Header for plugin exception management page on Content Settings dialog"> - Plug-in exceptions + Plugin exceptions </message> - <message name="IDS_PLUGIN_ALLOW_RADIO" desc="A radio button in the Content Settings dialog for allowing plug-ins use on any site."> + <message name="IDS_PLUGIN_ALLOW_RADIO" desc="A radio button in the Content Settings dialog for allowing plugins use on any site."> Run all plugin content (recommended) </message> <message name="IDS_PLUGIN_DETECT_RADIO" desc="A radio button in the Content Settings dialog for detecting and running important plugin content only."> Detect and run important plugin content </message> - <message name="IDS_PLUGIN_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for gating plug-ins on a context menu activation."> + <message name="IDS_PLUGIN_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for gating plugins on a context menu activation."> Let me choose when to run plugin content </message> - <message name="IDS_PLUGIN_MANAGE_INDIVIDUAL" desc="Link to manage individual plug-ins"> - Manage individual plug-ins... + <message name="IDS_PLUGIN_MANAGE_INDIVIDUAL" desc="Link to manage individual plugins"> + Manage individual plugins... </message> <message name="IDS_JAVASCRIPT_TAB_LABEL" desc="Label for JavaScript tab on Content Settings dialog"> JavaScript @@ -8341,19 +8341,19 @@ I don't think this site should be blocked! </message> </if> <message name="IDS_PPAPI_BROKER_TAB_LABEL" desc="Label for PPAPI broker tab on Content Settings dialog"> - Unsandboxed plug-in access + Unsandboxed plugin access </message> <message name="IDS_PPAPI_BROKER_HEADER" desc="Label for PPAPI broker tab exception management page on Content Settings dialog"> - Unsandboxed plug-in access exceptions + Unsandboxed plugin access exceptions </message> <message name="IDS_PPAPI_BROKER_ALLOW_RADIO" desc="A radio button in Content Settings dialog to allow all sites to access the PPAPI broker."> - Allow all sites to use a plug-in to access your computer + Allow all sites to use a plugin to access your computer </message> <message name="IDS_PPAPI_BROKER_BLOCK_RADIO" desc="A radio button in Content Settings dialog to deny all sites to access the PPAPI broker."> - Do not allow any sites to use a plug-in to access your computer + Do not allow any sites to use a plugin to access your computer </message> <message name="IDS_PPAPI_BROKER_ASK_RADIO" desc="A radio button in Content Settings dialog to allow site to query the permision to access the PPAPI broker."> - Ask when a site wants to use a plug-in to access your computer (recommended) + Ask when a site wants to use a plugin to access your computer (recommended) </message> <message name="IDS_EXCEPTIONS_MANAGE" desc="The label on the button that launches the exceptions management page for a given content type"> @@ -12164,7 +12164,7 @@ Chrome ran out of memory. <ph name="PLUGIN_NAME">$1<ex>Quicktime</ex></ph> is required to display some elements on this page. </message> <message name="IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON" desc="Info Bar button to install missing plugin"> - Install plug-in... + Install plugin... </message> <message name="IDS_PLUGININSTALLER_PROBLEMSINSTALLING" desc="Infobar text for link to help center"> Problems installing? diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index a9dc0cf..24fce29 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -170,10 +170,10 @@ Chrome supports. --> https://support.google.com/chrome/?p=ib_chromeframe </message> <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Chrome Frame turndown prompt for IE 6, 7, and 8"> - This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser. + This site is using the retired Chrome Frame plugin which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser. </message> <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Chrome Frame turndown prompt for IE 9 and 10"> - This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser. + This site is using the retired Chrome Frame plugin which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser. </message> <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> New window diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index 174458d..84160cb 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -273,7 +273,7 @@ class BrowsingDataRemover // clears the respective waiting flag, and invokes NotifyAndDeleteIfDone. void OnKeywordsLoaded(); - // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone. + // Called when plugin data has been cleared. Invokes NotifyAndDeleteIfDone. void OnWaitableEventSignaled(base::WaitableEvent* waitable_event); #if defined(ENABLE_PLUGINS) diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 7fbe733..d334a96 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -139,7 +139,7 @@ bool MakePepperFlashPluginInfo(const base::FilePath& flash_path, bool IsPepperFlash(const content::WebPluginInfo& plugin) { // We try to recognize Pepper Flash by the following criteria: - // * It is a Pepper plug-in. + // * It is a Pepper plugin. // * It has the special Flash permissions. return plugin.is_pepper_plugin() && (plugin.pepper_permissions & ppapi::PERMISSION_FLASH); diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 1ed96bb..1fb1785 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -717,7 +717,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesTest, Baseline) { #endif // defined(ENABLE_PEPPER_CDMS) // The following tests verify that Pepper plugins that use JavaScript settings -// instead of Plug-ins settings still work when Plug-ins are blocked. +// instead of Plugins settings still work when Plugins are blocked. #if defined(ENABLE_PEPPER_CDMS) // The plugin successfully loaded above is blocked. diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 9c2d722..0418af8 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -2105,7 +2105,7 @@ TEST_F(DownloadTargetDeterminerTestWithPlugin, GetPathInDownloadDir(kInitialPath), item.get()); EXPECT_FALSE(target_info->is_filetype_handled_safely); - // Now register an unsandboxed PPAPI plug-in. This plugin should not be + // Now register an unsandboxed PPAPI plugin. This plugin should not be // considered secure. ScopedRegisterInternalPlugin ppapi_unsandboxed_plugin( plugin_service, diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h index 7d181b6..8380560 100644 --- a/chrome/browser/download/download_target_info.h +++ b/chrome/browser/download/download_target_info.h @@ -51,7 +51,7 @@ struct DownloadTargetInfo { // Whether the |target_path| would be handled safely by the browser if it were // to be opened with a file:// URL. This can be used later to decide how file // opens should be handled. The file is considered to be handled safely if the - // filetype is supported by the renderer or a sandboxed plug-in. + // filetype is supported by the renderer or a sandboxed plugin. bool is_filetype_handled_safely; }; diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 02f03f3..c6fc2c1 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -166,15 +166,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) { #if defined(OS_CHROMEOS) EXPECT_FALSE(result); #else - // TODO(bauerb): This might wrongly fail if the plug-in takes too long - // to load. Extension-private plug-ins don't appear in navigator.plugins, so - // we can't check for the plug-in in Javascript. + // TODO(bauerb): This might wrongly fail if the plugin takes too long + // to load. Extension-private plugins don't appear in navigator.plugins, so + // we can't check for the plugin in Javascript. EXPECT_TRUE(result); #endif - // Regression test for http://crbug.com/131811: The plug-in should be + // Regression test for http://crbug.com/131811: The plugin should be // whitelisted for the extension (and only for the extension), so it should be - // loaded even if content settings are set to block plug-ins. + // loaded even if content settings are set to block plugins. browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); ASSERT_TRUE(content::ExecuteScriptAndExtractBool( diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h index 16a6aa7..b0424ab 100644 --- a/chrome/browser/extensions/plugin_manager.h +++ b/chrome/browser/extensions/plugin_manager.h @@ -37,7 +37,7 @@ class PluginManager : public BrowserContextKeyedAPI, #if !defined(DISABLE_NACL) - // We implement some Pepper plug-ins using NaCl to take advantage of NaCl's + // We implement some Pepper plugins using NaCl to take advantage of NaCl's // strong sandbox. Typically, these NaCl modules are stored in extensions // and registered here. Not all NaCl modules need to register for a MIME // type, just the ones that are responsible for rendering a particular MIME diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index 72b6610..b22bc49 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -66,7 +66,7 @@ static const char kWebRtcAudioTestHtmlPage[] = // 2. For the user who will run the test: # pavucontrol // 3. In a separate terminal, # arecord dummy // 4. In pavucontrol, go to the recording tab. -// 5. For the ALSA plug-in [aplay]: ALSA Capture from, change from <x> to +// 5. For the ALSA plugin [aplay]: ALSA Capture from, change from <x> to // <Monitor of x>, where x is whatever your primary sound device is called. // 6. Try launching chrome as the target user on the target machine, try // playing, say, a YouTube video, and record with # arecord -f dat tmp.dat. diff --git a/chrome/browser/metrics/plugin_metrics_provider.cc b/chrome/browser/metrics/plugin_metrics_provider.cc index 44491bd..35c789b 100644 --- a/chrome/browser/metrics/plugin_metrics_provider.cc +++ b/chrome/browser/metrics/plugin_metrics_provider.cc @@ -301,8 +301,8 @@ void PluginMetricsProvider::LogPluginLoadingError( ChildProcessStats& stats = child_process_stats_buffer_[plugin.name]; // Initialize the type if this entry is new. if (stats.process_type == content::PROCESS_TYPE_UNKNOWN) { - // The plug-in process might not actually be of type PLUGIN (which means - // NPAPI), but we only care that it is *a* plug-in process. + // The plugin process might not actually be of type PLUGIN (which means + // NPAPI), but we only care that it is *a* plugin process. stats.process_type = content::PROCESS_TYPE_PLUGIN; } else { DCHECK(IsPluginProcess(stats.process_type)); diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h index c5f247e..885ce6a 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.h +++ b/chrome/browser/pepper_broker_infobar_delegate.h @@ -18,7 +18,7 @@ namespace content { class WebContents; } -// Shows an infobar that asks the user whether a Pepper plug-in is allowed +// Shows an infobar that asks the user whether a Pepper plugin is allowed // to connect to its (privileged) broker. The user decision is made "sticky" // by storing a content setting for the site. class PepperBrokerInfoBarDelegate : public ConfirmInfoBarDelegate { diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc index 03cd341..82296fd 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc @@ -141,7 +141,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable( bool ChromePluginServiceFilter::CanLoadPlugin(int render_process_id, const base::FilePath& path) { - // The browser itself sometimes loads plug-ins to e.g. clear plug-in data. + // The browser itself sometimes loads plugins to e.g. clear plugin data. // We always grant the browser permission. if (!render_process_id) return true; diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h index bab42e0..31de3cb 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.h +++ b/chrome/browser/plugins/chrome_plugin_service_filter.h @@ -52,14 +52,14 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, Profile* profile, const GURL& url); - // Lifts a restriction on a plug-in. + // Lifts a restriction on a plugin. void UnrestrictPlugin(const base::FilePath& plugin_path); - // Authorizes a given plug-in for a given process. + // Authorizes a given plugin for a given process. void AuthorizePlugin(int render_process_id, const base::FilePath& plugin_path); - // Authorizes all plug-ins for a given WebContents. If |load_blocked| is true, + // Authorizes all plugins for a given WebContents. If |load_blocked| is true, // then the renderer is told to load the plugin with given |identifier| (or // pllugins if |identifier| is empty). // This method can only be called on the UI thread. diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 5521c01..626b0a3 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -33,7 +33,7 @@ namespace { typedef std::map<std::string, PluginMetadata*> PluginMap; -// Gets the full path of the plug-in file as the identifier. +// Gets the full path of the plugin file as the identifier. std::string GetLongIdentifier(const content::WebPluginInfo& plugin) { return plugin.path.AsUTF8Unsafe(); } @@ -43,7 +43,7 @@ std::string GetIdentifier(const content::WebPluginInfo& plugin) { return plugin.path.BaseName().AsUTF8Unsafe(); } -// Gets the plug-in group name as the plug-in name if it is not empty or +// Gets the plugin group name as the plugin name if it is not empty or // the filename without extension if the name is empty. static base::string16 GetGroupName(const content::WebPluginInfo& plugin) { if (!plugin.name.empty()) @@ -148,7 +148,7 @@ PluginFinder::PluginFinder() : version_(-1) { void PluginFinder::Init() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - // Load the built-in plug-in list first. If we have a newer version stored + // Load the built-in plugin list first. If we have a newer version stored // locally or download one, we will replace this one with it. scoped_ptr<base::DictionaryValue> plugin_list(LoadBuiltInPluginList()); DCHECK(plugin_list); @@ -280,7 +280,7 @@ scoped_ptr<PluginMetadata> PluginFinder::GetPluginMetadata( return it->second->Clone(); } - // The plug-in metadata was not found, create a dummy one holding + // The plugin metadata was not found, create a dummy one holding // the name, identifier and group name only. std::string identifier = GetIdentifier(plugin); PluginMetadata* metadata = new PluginMetadata(identifier, diff --git a/chrome/browser/plugins/plugin_finder.h b/chrome/browser/plugins/plugin_finder.h index 41c5fc6..2940dbb 100644 --- a/chrome/browser/plugins/plugin_finder.h +++ b/chrome/browser/plugins/plugin_finder.h @@ -43,7 +43,7 @@ class PluginFinder { void ReinitializePlugins(const base::DictionaryValue* json_metadata); #if defined(ENABLE_PLUGIN_INSTALLATION) - // Finds a plug-in for the given MIME type and language (specified as an IETF + // Finds a plugin for the given MIME type and language (specified as an IETF // language tag, i.e. en-US). If found, sets |installer| to the // corresponding PluginInstaller and |plugin_metadata| to a copy of the // corresponding PluginMetadata. @@ -52,7 +52,7 @@ class PluginFinder { PluginInstaller** installer, scoped_ptr<PluginMetadata>* plugin_metadata); - // Finds the plug-in with the given identifier. If found, sets |installer| + // Finds the plugin with the given identifier. If found, sets |installer| // to the corresponding PluginInstaller and |plugin_metadata| to a copy // of the corresponding PluginMetadata. |installer| may be NULL. bool FindPluginWithIdentifier(const std::string& identifier, @@ -60,10 +60,10 @@ class PluginFinder { scoped_ptr<PluginMetadata>* plugin_metadata); #endif - // Returns the plug-in name with the given identifier. + // Returns the plugin name with the given identifier. base::string16 FindPluginNameWithIdentifier(const std::string& identifier); - // Gets plug-in metadata using |plugin|. + // Gets plugin metadata using |plugin|. scoped_ptr<PluginMetadata> GetPluginMetadata( const content::WebPluginInfo& plugin); @@ -76,8 +76,8 @@ class PluginFinder { PluginFinder(); ~PluginFinder(); - // Loads the plug-in information from the browser resources and parses it. - // Returns NULL if the plug-in list couldn't be parsed. + // Loads the plugin information from the browser resources and parses it. + // Returns NULL if the plugin list couldn't be parsed. static base::DictionaryValue* LoadBuiltInPluginList(); #if defined(ENABLE_PLUGIN_INSTALLATION) diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 259f0d7..bb2c2cd 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -351,8 +351,8 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT; bool uses_default_content_setting = true; bool is_managed = false; - // Check plug-in content settings. The primary URL is the top origin URL and - // the secondary URL is the plug-in URL. + // Check plugin content settings. The primary URL is the top origin URL and + // the secondary URL is the plugin URL. GetPluginContentSetting(plugin, params.top_origin_url, params.url, plugin_metadata->identifier(), &plugin_setting, &uses_default_content_setting, &is_managed); @@ -361,7 +361,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( PluginMetadata::SecurityStatus plugin_status = plugin_metadata->GetSecurityStatus(plugin); #if defined(ENABLE_PLUGIN_INSTALLATION) - // Check if the plug-in is outdated. + // Check if the plugin is outdated. if (plugin_status == PluginMetadata::SECURITY_STATUS_OUT_OF_DATE && !allow_outdated_plugins_.GetValue()) { if (allow_outdated_plugins_.IsManaged()) { @@ -373,13 +373,13 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( return; } #endif - // Check if the plug-in or its group is enabled by policy. + // Check if the plugin or its group is enabled by policy. PluginPrefs::PolicyStatus plugin_policy = plugin_prefs_->PolicyStatusForPlugin(plugin.name); PluginPrefs::PolicyStatus group_policy = plugin_prefs_->PolicyStatusForPlugin(plugin_metadata->name()); - // Check if the plug-in requires authorization. + // Check if the plugin requires authorization. if (plugin_status == PluginMetadata::SECURITY_STATUS_REQUIRES_AUTHORIZATION && plugin.type != WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS && @@ -396,7 +396,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( return; } - // Check if the plug-in is crashing too much. + // Check if the plugin is crashing too much. if (PluginService::GetInstance()->IsPluginUnstable(plugin.path) && !always_authorize_plugins_.GetValue() && plugin_setting != CONTENT_SETTING_BLOCK && @@ -473,10 +473,10 @@ bool PluginInfoMessageFilter::Context::FindEnabledPlugin( } } - // If we broke out of the loop, we have found an enabled plug-in. + // If we broke out of the loop, we have found an enabled plugin. bool enabled = i < matching_plugins.size(); if (!enabled) { - // Otherwise, we only found disabled plug-ins, so we take the first one. + // Otherwise, we only found disabled plugins, so we take the first one. i = 0; status->value = ChromeViewHostMsg_GetPluginInfo_Status::kDisabled; } diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index 7df942b..a9d29a9 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -34,7 +34,7 @@ namespace extensions { class ExtensionRegistry; } -// This class filters out incoming IPC messages requesting plug-in information. +// This class filters out incoming IPC messages requesting plugin information. class PluginInfoMessageFilter : public content::BrowserMessageFilter { public: struct GetPluginInfo_Params; diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc index 59bd2ba..a1cf28a 100644 --- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc +++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc @@ -64,7 +64,7 @@ bool FakePluginServiceFilter::IsPluginAvailable( std::map<base::FilePath, bool>::iterator it = plugin_state_.find(plugin->path); if (it == plugin_state_.end()) { - ADD_FAILURE() << "No plug-in state for '" << plugin->path.value() << "'"; + ADD_FAILURE() << "No plugin state for '" << plugin->path.value() << "'"; return false; } return it->second; @@ -86,10 +86,10 @@ class PluginInfoMessageFilterTest : public ::testing::Test { } void SetUp() override { - content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plug-in"), + content::WebPluginInfo foo_plugin(base::ASCIIToUTF16("Foo Plugin"), foo_plugin_path_, base::ASCIIToUTF16("1"), - base::ASCIIToUTF16("The Foo plug-in.")); + base::ASCIIToUTF16("The Foo plugin.")); content::WebPluginMimeType mime_type; mime_type.mime_type = "foo/bar"; foo_plugin.mime_types.push_back(mime_type); @@ -97,10 +97,10 @@ class PluginInfoMessageFilterTest : public ::testing::Test { PluginService::GetInstance()->Init(); PluginService::GetInstance()->RegisterInternalPlugin(foo_plugin, false); - content::WebPluginInfo bar_plugin(base::ASCIIToUTF16("Bar Plug-in"), + content::WebPluginInfo bar_plugin(base::ASCIIToUTF16("Bar Plugin"), bar_plugin_path_, base::ASCIIToUTF16("1"), - base::ASCIIToUTF16("The Bar plug-in.")); + base::ASCIIToUTF16("The Bar plugin.")); mime_type.mime_type = "foo/bar"; bar_plugin.mime_types.push_back(mime_type); bar_plugin.type = content::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS; diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h index b342141..5753031 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.h +++ b/chrome/browser/plugins/plugin_infobar_delegates.h @@ -21,7 +21,7 @@ namespace content { class WebContents; } -// Base class for blocked plug-in infobars. +// Base class for blocked plugin infobars. class PluginInfoBarDelegate : public ConfirmInfoBarDelegate { protected: explicit PluginInfoBarDelegate(const std::string& identifier); @@ -45,7 +45,7 @@ class PluginInfoBarDelegate : public ConfirmInfoBarDelegate { }; #if defined(ENABLE_PLUGIN_INSTALLATION) -// Infobar that's shown when a plug-in is out of date. +// Infobar that's shown when a plugin is out of date. class OutdatedPluginInfoBarDelegate : public PluginInfoBarDelegate, public WeakPluginInstallerObserver { public: @@ -99,7 +99,7 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate, // Shows an infobar asking whether to install the plugin represented by // |installer|. When the user accepts, |callback| is called. - // During installation of the plug-in, the infobar will change to reflect the + // During installation of the plugin, the infobar will change to reflect the // installation state. static void Create(InfoBarService* infobar_service, PluginInstaller* installer, @@ -148,7 +148,7 @@ class PluginInstallerInfoBarDelegate : public ConfirmInfoBarDelegate, InstallCallback callback_; - // True iff the plug-in isn't installed yet. + // True iff the plugin isn't installed yet. bool new_install_; base::string16 message_; diff --git a/chrome/browser/plugins/plugin_metadata.cc b/chrome/browser/plugins/plugin_metadata.cc index 33f83a0..e79df9e 100644 --- a/chrome/browser/plugins/plugin_metadata.cc +++ b/chrome/browser/plugins/plugin_metadata.cc @@ -61,7 +61,7 @@ bool PluginMetadata::HasMimeType(const std::string& mime_type) const { bool PluginMetadata::MatchesPlugin(const content::WebPluginInfo& plugin) { for (size_t i = 0; i < matching_mime_types_.size(); ++i) { // To have a match, every one of the |matching_mime_types_| - // must be handled by the plug-in. + // must be handled by the plugin. size_t j = 0; for (; j < plugin.mime_types.size(); ++j) { if (plugin.mime_types[j].mime_type == matching_mime_types_[i]) diff --git a/chrome/browser/plugins/plugin_metadata.h b/chrome/browser/plugins/plugin_metadata.h index 261e6e8..d2be9e7 100644 --- a/chrome/browser/plugins/plugin_metadata.h +++ b/chrome/browser/plugins/plugin_metadata.h @@ -18,7 +18,7 @@ struct WebPluginInfo; class PluginMetadata { public: - // Information about a certain version of the plug-in. + // Information about a certain version of the plugin. enum SecurityStatus { SECURITY_STATUS_UP_TO_DATE, SECURITY_STATUS_OUT_OF_DATE, @@ -44,15 +44,15 @@ class PluginMetadata { const std::string& language); ~PluginMetadata(); - // Unique identifier for the plug-in. + // Unique identifier for the plugin. const std::string& identifier() const { return identifier_; } - // Human-readable name of the plug-in. + // Human-readable name of the plugin. const base::string16& name() const { return name_; } // If |url_for_display| is false, |plugin_url| is the URL of the download page - // for the plug-in, which should be opened in a new tab. If it is true, - // |plugin_url| is the URL of the plug-in installer binary, which can be + // for the plugin, which should be opened in a new tab. If it is true, + // |plugin_url| is the URL of the plugin installer binary, which can be // directly downloaded. bool url_for_display() const { return url_for_display_; } const GURL& plugin_url() const { return plugin_url_; } @@ -66,7 +66,7 @@ class PluginMetadata { void AddMimeType(const std::string& mime_type); void AddMatchingMimeType(const std::string& mime_type); - // Adds information about a plug-in version. + // Adds information about a plugin version. void AddVersion(const Version& version, SecurityStatus status); // Checks if |plugin| mime types match all |matching_mime_types_|. @@ -79,7 +79,7 @@ class PluginMetadata { static bool ParseSecurityStatus(const std::string& status_str, SecurityStatus* status); - // Returns the security status for the given plug-in (i.e. whether it is + // Returns the security status for the given plugin (i.e. whether it is // considered out-of-date, etc.) SecurityStatus GetSecurityStatus(const content::WebPluginInfo& plugin) const; diff --git a/chrome/browser/plugins/plugin_metadata_unittest.cc b/chrome/browser/plugins/plugin_metadata_unittest.cc index 03d57a7..fe9e2e6 100644 --- a/chrome/browser/plugins/plugin_metadata_unittest.cc +++ b/chrome/browser/plugins/plugin_metadata_unittest.cc @@ -14,10 +14,10 @@ PluginMetadata::SecurityStatus GetSecurityStatus( PluginMetadata* plugin_metadata, const char* version) { content::WebPluginInfo plugin( - base::ASCIIToUTF16("Foo plug-in"), + base::ASCIIToUTF16("Foo plugin"), base::FilePath(FILE_PATH_LITERAL("/tmp/plugin.so")), base::ASCIIToUTF16(version), - base::ASCIIToUTF16("Foo plug-in.")); + base::ASCIIToUTF16("Foo plugin.")); return plugin_metadata->GetSecurityStatus(plugin); } diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 53b96a0..23ba08b 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -382,8 +382,8 @@ void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id, NOTREACHED(); } #else - // If we don't support third-party plug-in installation, we shouldn't have - // outdated plug-ins. + // If we don't support third-party plugin installation, we shouldn't have + // outdated plugins. NOTREACHED(); #endif // defined(ENABLE_PLUGIN_INSTALLATION) } diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index 1dd8d77..97dcf99 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc @@ -121,7 +121,7 @@ void PluginPrefs::EnablePluginGroupInternal( // Set the desired state for the group. plugin_group_state_[group_name] = enabled; - // Update the state for all plug-ins in the group. + // Update the state for all plugins in the group. for (size_t i = 0; i < plugins.size(); ++i) { scoped_ptr<PluginMetadata> plugin(finder->GetPluginMetadata(plugins[i])); if (group_name != plugin->name()) @@ -175,7 +175,7 @@ void PluginPrefs::EnablePluginInternal( const base::Callback<void(bool)>& callback, const std::vector<content::WebPluginInfo>& plugins) { { - // Set the desired state for the plug-in. + // Set the desired state for the plugin. base::AutoLock auto_lock(lock_); plugin_state_.Set(path, enabled); } @@ -185,7 +185,7 @@ void PluginPrefs::EnablePluginInternal( if (plugins[i].path == path) { scoped_ptr<PluginMetadata> plugin_metadata( plugin_finder->GetPluginMetadata(plugins[i])); - // set the group name for this plug-in. + // set the group name for this plugin. group_name = plugin_metadata->name(); DCHECK_EQ(enabled, IsPluginEnabled(plugins[i])); break; @@ -203,7 +203,7 @@ void PluginPrefs::EnablePluginInternal( } if (!group_name.empty()) { - // Update the state for the corresponding plug-in group. + // Update the state for the corresponding plugin group. base::AutoLock auto_lock(lock_); plugin_group_state_[group_name] = !all_disabled; } @@ -234,13 +234,13 @@ bool PluginPrefs::IsPluginEnabled(const content::WebPluginInfo& plugin) const { PluginFinder::GetInstance()->GetPluginMetadata(plugin)); base::string16 group_name = plugin_metadata->name(); - // Check if the plug-in or its group is enabled by policy. + // Check if the plugin or its group is enabled by policy. PolicyStatus plugin_status = PolicyStatusForPlugin(plugin.name); PolicyStatus group_status = PolicyStatusForPlugin(group_name); if (plugin_status == POLICY_ENABLED || group_status == POLICY_ENABLED) return true; - // Check if the plug-in or its group is disabled by policy. + // Check if the plugin or its group is disabled by policy. if (plugin_status == POLICY_DISABLED || group_status == POLICY_DISABLED) return false; @@ -257,12 +257,12 @@ bool PluginPrefs::IsPluginEnabled(const content::WebPluginInfo& plugin) const { #endif base::AutoLock auto_lock(lock_); - // Check user preferences for the plug-in. + // Check user preferences for the plugin. bool plugin_enabled = false; if (plugin_state_.Get(plugin.path, &plugin_enabled)) return plugin_enabled; - // Check user preferences for the plug-in group. + // Check user preferences for the plugin group. std::map<base::string16, bool>::const_iterator group_it( plugin_group_state_.find(group_name)); if (group_it != plugin_group_state_.end()) @@ -563,7 +563,7 @@ void PluginPrefs::OnUpdatePreferences( group_names.insert(plugin_metadata->name()); } - // Add the plug-in groups. + // Add the plugin groups. for (std::set<base::string16>::const_iterator it = group_names.begin(); it != group_names.end(); ++it) { base::DictionaryValue* summary = new base::DictionaryValue(); diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 7a797c0..d95db2d 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -27,7 +27,7 @@ namespace content { struct WebPluginInfo; } -// This class stores information about whether a plug-in or a plug-in group is +// This class stores information about whether a plugin or a plugin group is // enabled or disabled. // Except where otherwise noted, it can be used on every thread. class PluginPrefs : public RefcountedKeyedService { @@ -57,15 +57,15 @@ class PluginPrefs : public RefcountedKeyedService { // Enable or disable a plugin group. void EnablePluginGroup(bool enable, const base::string16& group_name); - // Enables or disables a specific plug-in file, if possible. - // If the plug-in state can't be changed (because of a policy for example) - // then enabling/disabling the plug-in is ignored and |callback| is run - // with 'false' passed to it. Otherwise the plug-in state is changed + // Enables or disables a specific plugin file, if possible. + // If the plugin state can't be changed (because of a policy for example) + // then enabling/disabling the plugin is ignored and |callback| is run + // with 'false' passed to it. Otherwise the plugin state is changed // and |callback| is run with 'true' passed to it. void EnablePlugin(bool enable, const base::FilePath& file_path, const base::Callback<void(bool)>& callback); - // Returns whether there is a policy enabling or disabling plug-ins of the + // Returns whether there is a policy enabling or disabling plugins of the // given name. PolicyStatus PolicyStatusForPlugin(const base::string16& name) const; @@ -107,7 +107,7 @@ class PluginPrefs : public RefcountedKeyedService { void UpdatePatternsAndNotify(std::set<base::string16>* patterns, const std::string& pref_name); - // Allows unit tests to directly set enforced plug-in patterns. + // Allows unit tests to directly set enforced plugin patterns. void SetPolicyEnforcedPluginPatterns( const std::set<base::string16>& disabled_patterns, const std::set<base::string16>& disabled_exception_patterns, diff --git a/chrome/browser/plugins/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h index ee7c975..ee08c2e 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.h +++ b/chrome/browser/plugins/plugin_status_pref_setter.h @@ -33,7 +33,7 @@ class PluginStatusPrefSetter : public content::NotificationObserver { // Binds the preferences in the profile's PrefService, notifying |observer| if // any value changes. // This asynchronously calls the PluginService to get the list of installed - // plug-ins. + // plugins. void Init(Profile* profile, const BooleanPrefMember::NamedChangeCallback& observer); diff --git a/chrome/browser/plugins/plugins_resource_service.h b/chrome/browser/plugins/plugins_resource_service.h index eb4074d..6a123a3 100644 --- a/chrome/browser/plugins/plugins_resource_service.h +++ b/chrome/browser/plugins/plugins_resource_service.h @@ -10,7 +10,7 @@ class PrefService; class PrefRegistrySimple; -// This resource service periodically fetches plug-in metadata +// This resource service periodically fetches plugin metadata // from a remote server and updates local state and PluginFinder. class PluginsResourceService : public ChromeWebResourceService { public: diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html index 4636232..6b670a1 100644 --- a/chrome/browser/resources/about_memory.html +++ b/chrome/browser/resources/about_memory.html @@ -178,7 +178,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(3) { not just Chrome. </div> <div class="otherbrowsers" jsdisplay="browsers.length > 1"> - Note: Chrome includes memory used by plug-ins, other browsers may not. + Note: Chrome includes memory used by plugins, other browsers may not. </div> <br><br><br> diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html index a204a02..63a1712 100644 --- a/chrome/browser/resources/about_memory_linux.html +++ b/chrome/browser/resources/about_memory_linux.html @@ -103,7 +103,7 @@ about:memory template page </div> <div class="otherbrowsers" jsdisplay="show_other_browsers && browsers.length > 1"> - Note: Chrome includes memory used by plug-ins, other browsers may not. + Note: Chrome includes memory used by plugins, other browsers may not. </div> <br><br><br> diff --git a/chrome/browser/resources/about_memory_mac.html b/chrome/browser/resources/about_memory_mac.html index 58f698e..6662ee0 100644 --- a/chrome/browser/resources/about_memory_mac.html +++ b/chrome/browser/resources/about_memory_mac.html @@ -136,7 +136,7 @@ table.list#memoryDetails tr.firstRow th:nth-child(2) { not just Chrome. </div> <div class="otherbrowsers" jsdisplay="browsers.length > 1"> - Note: Chrome includes memory used by plug-ins, other browsers may not. + Note: Chrome includes memory used by plugins, other browsers may not. </div> <div class="otherbrowsers"> (Bug: We seriously overcount our own memory usage: <a href="http://crbug.com/25454">Issue 25454</a>.) diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html index 578d476..efac743 100644 --- a/chrome/browser/resources/chromeos/about_os_credits.html +++ b/chrome/browser/resources/chromeos/about_os_credits.html @@ -23196,7 +23196,7 @@ Description: =============================== Questions, comments, and bug reports should be directed to the `distutils-sig mailing list`_. If you have written (or know of) any tutorials, documentation, - plug-ins, or other resources for setuptools users, please let us know about + plugins, or other resources for setuptools users, please let us know about them there, so this reference list can be updated. If you have working, *tested* patches to correct problems or add features, you may submit them to the `setuptools bug tracker`_. @@ -23232,10 +23232,10 @@ Description: =============================== * Phillip J. Eby is the principal author and maintainer of setuptools, and first proposed the idea of an importable binary distribution format for - Python application plug-ins. + Python application plugins. * Significant parts of the implementation of setuptools were funded by the Open - Source Applications Foundation, to provide a plug-in infrastructure for the + Source Applications Foundation, to provide a plugin infrastructure for the Chandler PIM application. In addition, many OSAF staffers (such as Mike "Code Bear" Taylor) contributed their time and stress as guinea pigs for the use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) @@ -24234,7 +24234,7 @@ Description: =============================== Questions, comments, and bug reports should be directed to the `distutils-sig mailing list`_. If you have written (or know of) any tutorials, documentation, - plug-ins, or other resources for setuptools users, please let us know about + plugins, or other resources for setuptools users, please let us know about them there, so this reference list can be updated. If you have working, *tested* patches to correct problems or add features, you may submit them to the `setuptools bug tracker`_. @@ -24270,10 +24270,10 @@ Description: =============================== * Phillip J. Eby is the principal author and maintainer of setuptools, and first proposed the idea of an importable binary distribution format for - Python application plug-ins. + Python application plugins. * Significant parts of the implementation of setuptools were funded by the Open - Source Applications Foundation, to provide a plug-in infrastructure for the + Source Applications Foundation, to provide a plugin infrastructure for the Chandler PIM application. In addition, many OSAF staffers (such as Mike "Code Bear" Taylor) contributed their time and stress as guinea pigs for the use of eggs and setuptools, even before eggs were "cool". (Thanks, guys!) diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/pdf_processor.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/pdf_processor.js index b6ca6d1..c0b1188 100644 --- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/pdf_processor.js +++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/pdf_processor.js @@ -11,7 +11,7 @@ goog.provide('cvox.PdfProcessor'); goog.require('cvox.QueueMode'); /** - * Process PDFs created with Chrome's built-in PDF plug-in, which has an + * Process PDFs created with Chrome's built-in PDF plugin, which has an * accessibility hook. */ cvox.PdfProcessor.processEmbeddedPdfs = function() { diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html index ecdbc4e..a674881 100644 --- a/chrome/browser/resources/options/content_settings.html +++ b/chrome/browser/resources/options/content_settings.html @@ -172,7 +172,7 @@ </div> </div> </section> - <!-- Plug-ins filter --> + <!-- Plugins filter --> <section> <h3 i18n-content="pluginsTabLabel"></h3> <div class="replace-with-website-settings"> diff --git a/chrome/browser/resources/plugin_metadata/plugins_mac.json b/chrome/browser/resources/plugin_metadata/plugins_mac.json index b0831c1..35534d2 100644 --- a/chrome/browser/resources/plugin_metadata/plugins_mac.json +++ b/chrome/browser/resources/plugin_metadata/plugins_mac.json @@ -99,7 +99,7 @@ { "version": "0", "status": "requires_authorization", - "comment": "The Real Player plug-in for mac doesn't expose a version at all." + "comment": "The Real Player plugin for mac doesn't expose a version at all." } ], "lang": "en-US", diff --git a/chrome/browser/resources/plugin_metadata/plugins_win.json b/chrome/browser/resources/plugin_metadata/plugins_win.json index 5317809..1f86f25 100644 --- a/chrome/browser/resources/plugin_metadata/plugins_win.json +++ b/chrome/browser/resources/plugin_metadata/plugins_win.json @@ -366,7 +366,7 @@ { "version": "0", "status": "requires_authorization", - "comment": "Google Update plug-in is versioned but kept automatically up-to-date" + "comment": "Google Update plugin is versioned but kept automatically up-to-date" } ], "name": "Google Update", diff --git a/chrome/browser/task_manager/child_process_resource_provider.cc b/chrome/browser/task_manager/child_process_resource_provider.cc index d4714b3..e46d182 100644 --- a/chrome/browser/task_manager/child_process_resource_provider.cc +++ b/chrome/browser/task_manager/child_process_resource_provider.cc @@ -49,7 +49,7 @@ class ChildProcessResource : public Resource { private: // Returns a localized title for the child process. For example, a plugin - // process would be "Plug-in: Flash" when name is "Flash". + // process would be "Plugin: Flash" when name is "Flash". base::string16 GetLocalizedTitle() const; int process_type_; diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h index c63e097..fb72749 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h @@ -81,7 +81,7 @@ typedef std::map<NSPopUpButton*, MediaMenuParts*> MediaMenuPartsMap; // Callback for "info" link. - (IBAction)showMoreInfo:(id)sender; -// Callback for "load" (plug-ins, mixed script) button. +// Callback for "load" (plugins, mixed script) button. - (IBAction)load:(id)sender; // Callback for "Learn More" link. diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 23c1275..8154cb2 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -510,7 +510,7 @@ void ContentSettingPluginBubbleModel::OnCustomLinkClicked() { if (!web_contents()) return; #if defined(ENABLE_PLUGINS) - // TODO(bauerb): We should send the identifiers of blocked plug-ins here. + // TODO(bauerb): We should send the identifiers of blocked plugins here. ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( web_contents(), true, std::string()); #endif diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index eca5db3..dc40e45 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -206,7 +206,7 @@ class PDFUnsupportedFeatureInterstitial } else if (command == "2") { content::RecordAction( UserMetricsAction("PDF_ReaderInterstitialIgnore")); - // Pretend that the plug-in is up-to-date so that we don't block it. + // Pretend that the plugin is up-to-date so that we don't block it. reader_webplugininfo_.version = base::ASCIIToUTF16("11.0.0.0"); OpenUsingReader(web_contents_, reader_webplugininfo_, NULL); } else { diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 650861f..b568f01 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -316,7 +316,7 @@ void ContentSettingsHandler::GetLocalizedValues( {"javascript_header", IDS_JAVASCRIPT_HEADER}, {"javascriptAllow", IDS_JS_ALLOW_RADIO}, {"javascriptBlock", IDS_JS_DONOTALLOW_RADIO}, - // Plug-ins filter. + // Plugins filter. {"pluginsTabLabel", IDS_PLUGIN_TAB_LABEL}, {"plugins_header", IDS_PLUGIN_HEADER}, {"pluginsAllow", IDS_PLUGIN_ALLOW_RADIO}, diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 4224902..de945d1 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -174,8 +174,8 @@ class PluginsDOMHandler : public WebUIMessageHandler, content::NotificationRegistrar registrar_; - // Holds grouped plug-ins. The key is the group identifier and - // the value is the list of plug-ins belonging to the group. + // Holds grouped plugins. The key is the group identifier and + // the value is the list of plugins belonging to the group. typedef base::hash_map<std::string, std::vector<const WebPluginInfo*> > PluginGroups; @@ -226,7 +226,7 @@ void PluginsDOMHandler::HandleRequestPluginsData(const base::ListValue* args) { void PluginsDOMHandler::HandleEnablePluginMessage(const base::ListValue* args) { Profile* profile = Profile::FromWebUI(web_ui()); - // Be robust in accepting badness since plug-ins display HTML (hence + // Be robust in accepting badness since plugins display HTML (hence // JavaScript). if (args->GetSize() != 3) { NOTREACHED(); @@ -310,7 +310,7 @@ void PluginsDOMHandler::HandleSetPluginAlwaysAllowed( plugin, allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_DEFAULT); - // Keep track of the whitelist separately, so that we can distinguish plug-ins + // Keep track of the whitelist separately, so that we can distinguish plugins // whitelisted by the user from automatically whitelisted ones. DictionaryPrefUpdate update(profile->GetPrefs(), prefs::kContentSettingsPluginWhitelist); @@ -341,8 +341,8 @@ void PluginsDOMHandler::PluginsLoaded( ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard(); PluginFinder* plugin_finder = PluginFinder::GetInstance(); - // Group plug-ins by identifier. This is done to be able to display - // the plug-ins in UI in a grouped fashion. + // Group plugins by identifier. This is done to be able to display + // the plugins in UI in a grouped fashion. PluginGroups groups; for (size_t i = 0; i < plugins.size(); ++i) { scoped_ptr<PluginMetadata> plugin( diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index 5a7ed54..18996b9 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -183,7 +183,7 @@ }, { # This file is used by the component installer. - # It is not a complete plug-in on its own. + # It is not a complete plugin on its own. 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/', 'files': [], 'conditions': [ diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 163b3cd..94905fe 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -54,7 +54,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; // Don't block outdated plugins. const char kAllowOutdatedPlugins[] = "allow-outdated-plugins"; -// By default, an https page cannot run JavaScript, CSS or plug-ins from http +// By default, an https page cannot run JavaScript, CSS or plugins from http // URLs. This provides an override to get the old insecure behavior. const char kAllowRunningInsecureContent[] = "allow-running-insecure-content"; @@ -65,7 +65,7 @@ const char kAlternateProtocolProbabilityThreshold[] = "alternate-protocol-probability-threshold"; // Prevents Chrome from requiring authorization to run certain widely installed -// but less commonly used plug-ins. +// but less commonly used plugins. const char kAlwaysAuthorizePlugins[] = "always-authorize-plugins"; // Specifies that the extension-app with the specified id should be launched diff --git a/chrome/common/extensions/api/content_settings.json b/chrome/common/extensions/api/content_settings.json index a8b70da..b44bff5 100644 --- a/chrome/common/extensions/api/content_settings.json +++ b/chrome/common/extensions/api/content_settings.json @@ -5,7 +5,7 @@ [ { "namespace": "contentSettings", - "description": "Use the <code>chrome.contentSettings</code> API to change settings that control whether websites can use features such as cookies, JavaScript, and plug-ins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.", + "description": "Use the <code>chrome.contentSettings</code> API to change settings that control whether websites can use features such as cookies, JavaScript, and plugins. More generally speaking, content settings allow you to customize Chrome's behavior on a per-site basis instead of globally.", "compiler_options": { "generate_type_functions": true }, @@ -207,7 +207,7 @@ }, "plugins": { "$ref": "ContentSetting", - "description": "Whether to run plug-ins. One of<br><var>allow</var>: Run plug-ins automatically,<br><var>block</var>: Don't run plug-ins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.", + "description": "Whether to run plugins. One of<br><var>allow</var>: Run plugins automatically,<br><var>block</var>: Don't run plugins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.", "value": [ "plugins", {"type":"string", "enum": ["allow", "block"]} @@ -247,7 +247,7 @@ }, "unsandboxedPlugins": { "$ref": "ContentSetting", - "description": "Whether to allow sites to run plug-ins unsandboxed. One of <br><var>allow</var>: Allow sites to run plug-ins unsandboxed,<br><var>block</var>: Don't allow sites to run plug-ins unsandboxed,<br><var>ask</var>: Ask when a site wants to run a plug-in unsandboxed. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.", + "description": "Whether to allow sites to run plugins unsandboxed. One of <br><var>allow</var>: Allow sites to run plugins unsandboxed,<br><var>block</var>: Don't allow sites to run plugins unsandboxed,<br><var>ask</var>: Ask when a site wants to run a plugin unsandboxed. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.", "value": [ "ppapi-broker", {"type":"string", "enum": ["allow", "block", "ask"]} diff --git a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html index bbc62c52..71b9ce3 100644 --- a/chrome/common/extensions/docs/examples/api/contentSettings/popup.html +++ b/chrome/common/extensions/docs/examples/api/contentSettings/popup.html @@ -32,7 +32,7 @@ <option value="ask">Ask</option> <option value="block">Block</option> </select></dd> - <dt><label for="plugins">Plug-ins: </label></dt> + <dt><label for="plugins">Plugins: </label></dt> <dd><select id="plugins" disabled> <option value="allow">Allow</option> <option value="block">Block</option> @@ -71,7 +71,7 @@ <option value="ask">Ask</option> <option value="block">Block</option> </select></dd> - <dt><label for="unsandboxedPlugins">Unsandboxed plug-in access: </label></dt> + <dt><label for="unsandboxedPlugins">Unsandboxed plugin access: </label></dt> <dd><select id="unsandboxedPlugins" disabled> <option value="allow">Allow</option> <option value="ask">Ask</option> diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings/_locales/en/messages.json b/chrome/common/extensions/docs/examples/extensions/plugin_settings/_locales/en/messages.json index 95524bd..f2bd7f5 100644 --- a/chrome/common/extensions/docs/examples/extensions/plugin_settings/_locales/en/messages.json +++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings/_locales/en/messages.json @@ -3,7 +3,7 @@ "message": "Per-plugin content settings" }, "extDescription": { - "message": "Customize your content setting for different plug-ins." + "message": "Customize your content setting for different plugins." }, "patternColumnHeader": { "message": "Hostname Pattern" diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/chrome_stubs.js b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/chrome_stubs.js index 51058d6..63e61b2 100644 --- a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/chrome_stubs.js +++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/chrome_stubs.js @@ -48,7 +48,7 @@ chrome.i18n.getMessage = function(id) { } /** - * Creates a new Settings object with a set of rules for a dummy plug-in. + * Creates a new Settings object with a set of rules for a dummy plugin. * Because we provide stub implementations for the Chrome contentSettings * extension API, we know that the methods will execute immediately instead of * asynchronously. diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/main.js b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/main.js index d86c9f5..c731ff737 100644 --- a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/main.js +++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/main.js @@ -3,7 +3,7 @@ // found in the LICENSE file. /** - * @fileoverview Main entry point that creates a new plug-in list on document + * @fileoverview Main entry point that creates a new plugin list on document * load. */ diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_list.js b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_list.js index 050cacc..a0dff4c 100644 --- a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_list.js +++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_list.js @@ -3,7 +3,7 @@ // found in the LICENSE file. /** - * @fileoverview Defines a list of plug-ins that shows for each plug-in a list + * @fileoverview Defines a list of plugins that shows for each plugin a list * of content setting rules. */ @@ -24,27 +24,27 @@ cr.define('pluginSettings.ui', function() { HIDDEN: 'hidden', /** - * A plug-in list. + * A plugin list. */ PLUGIN_LIST: 'plugin-list', /** - * Set on a plug-in list entry to show details about the plug-in. + * Set on a plugin list entry to show details about the plugin. */ PLUGIN_SHOW_DETAILS: 'plugin-show-details', /** - * The plug-in name. + * The plugin name. */ PLUGIN_NAME: 'plugin-name', /** - * The number of rules set for a plug-in. + * The number of rules set for a plugin. */ NUM_RULES: 'num-rules', /** - * The element containing details about a plug-in. + * The element containing details about a plugin. */ PLUGIN_DETAILS: 'plugin-details', @@ -82,9 +82,9 @@ cr.define('pluginSettings.ui', function() { } /** - * Creates a new plug-in list item element. - * @param {!PluginList} list The plug-in list containing this item. - * @param {!Object} info Information about the plug-in. + * Creates a new plugin list item element. + * @param {!PluginList} list The plugin list containing this item. + * @param {!Object} info Information about the plugin. * @constructor * @extends {cr.ui.ListItem} */ @@ -92,14 +92,14 @@ cr.define('pluginSettings.ui', function() { var el = cr.doc.createElement('li'); /** - * The plug-in list containing this item. + * The plugin list containing this item. * @type {!PluginList} * @private */ el.list_ = list; /** - * Information about the plug-in. + * Information about the plugin. * @type {!Object} * @private */ @@ -114,7 +114,7 @@ cr.define('pluginSettings.ui', function() { __proto__: ListItem.prototype, /** - * The element containing details about the plug-in. This is only null in + * The element containing details about the plugin. This is only null in * the prototype. * @type {?HTMLDivElement} * @private @@ -175,7 +175,7 @@ cr.define('pluginSettings.ui', function() { }, /** - * Create the list of content setting rules applying to this plug-in. + * Create the list of content setting rules applying to this plugin. * @param {!pluginSettings.Settings} The settings object storing the content * setting rules. * @private @@ -237,7 +237,7 @@ cr.define('pluginSettings.ui', function() { }; /** - * Creates a new plug-in list. + * Creates a new plugin list. * @constructor * @extends {cr.ui.List} */ @@ -259,8 +259,8 @@ cr.define('pluginSettings.ui', function() { }, /** - * Creates a new plug-in list item. - * @param {!Object} info Information about the plug-in. + * Creates a new plugin list item. + * @param {!Object} info Information about the plugin. */ createItem: function(info) { return new PluginListItem(this, info); diff --git a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_settings.js b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_settings.js index 0b2923e..1727356 100644 --- a/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_settings.js +++ b/chrome/common/extensions/docs/examples/extensions/plugin_settings/js/plugin_settings.js @@ -12,14 +12,14 @@ cr.define('pluginSettings', function() { /** * Creates a new content settings model. - * @param {string} plugin Identifies the plug-in for which this object stores + * @param {string} plugin Identifies the plugin for which this object stores * settings. * @constructor * @extends {cr.EventTarget} */ function Settings(plugin) { /** - * Identifies the plug-in for which this object stores settings. + * Identifies the plugin for which this object stores settings. * @type {string} * @private */ @@ -195,7 +195,7 @@ cr.define('pluginSettings', function() { }, /** - * @return {!Array} A list of all content setting rules for this plug-in. + * @return {!Array} A list of all content setting rules for this plugin. */ getAll: function() { var rules = []; diff --git a/chrome/common/extensions/docs/templates/articles/permission_warnings.html b/chrome/common/extensions/docs/templates/articles/permission_warnings.html index 6079fac..ad5bf62 100644 --- a/chrome/common/extensions/docs/templates/articles/permission_warnings.html +++ b/chrome/common/extensions/docs/templates/articles/permission_warnings.html @@ -216,7 +216,7 @@ that trigger them. <tr> <td style="font-weight:bold"> <!-- IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS --> - Manipulate settings that specify whether websites can use features such as cookies, JavaScript, plug-ins, geolocation, microphone, camera etc. + Manipulate settings that specify whether websites can use features such as cookies, JavaScript, plugins, geolocation, microphone, camera etc. </td> <td> <!-- HasEffectiveBrowsingHistoryPermission --> diff --git a/chrome/common/extensions/docs/templates/intros/contentSettings.html b/chrome/common/extensions/docs/templates/intros/contentSettings.html index 343b0a7..02a480e 100644 --- a/chrome/common/extensions/docs/templates/intros/contentSettings.html +++ b/chrome/common/extensions/docs/templates/intros/contentSettings.html @@ -115,10 +115,10 @@ is ordered by precedence:</p> Resource identifiers allow you to specify content settings for specific subtypes of a content type. Currently, the only content type that supports resource identifiers is $(ref:contentSettings.plugins), -where a resource identifier identifies a specific plug-in. When applying content -settings, first the settings for the specific plug-in are checked. If there are -no settings found for the specific plug-in, the general content settings for -plug-ins are checked. +where a resource identifier identifies a specific plugin. When applying content +settings, first the settings for the specific plugin are checked. If there are +no settings found for the specific plugin, the general content settings for +plugins are checked. </p> <p> For example, if a content setting rule has the resource identifier @@ -129,8 +129,8 @@ it takes precedence over a rule without a resource identifier and the pattern <p> You can get a list of resource identifiers for a content type by calling the $(ref:contentSettings.ContentSetting.getResourceIdentifiers) method. The returned list -can change with the set of installed plug-ins on the user's machine, but Chrome -tries to keep the identifiers stable across plug-in updates. +can change with the set of installed plugins on the user's machine, but Chrome +tries to keep the identifiers stable across plugin updates. </p> <h2 id="examples">Examples</h2> diff --git a/chrome/common/mac/cfbundle_blocker.h b/chrome/common/mac/cfbundle_blocker.h index 4222035..44d8677 100644 --- a/chrome/common/mac/cfbundle_blocker.h +++ b/chrome/common/mac/cfbundle_blocker.h @@ -15,7 +15,7 @@ namespace chrome { namespace common { namespace mac { -// Arranges to block loading of some third-party plug-in code that might try +// Arranges to block loading of some third-party plugin code that might try // to inject itself into the process. Modules loaded by CFBundle are blocked // if located within specific directories. Because NSBundle uses CFBundle // behind the scenes, this also blocks modules loaded by NSBundle when located diff --git a/chrome/common/mac/cfbundle_blocker.mm b/chrome/common/mac/cfbundle_blocker.mm index b593ebb..3b8f69a 100644 --- a/chrome/common/mac/cfbundle_blocker.mm +++ b/chrome/common/mac/cfbundle_blocker.mm @@ -40,7 +40,7 @@ namespace mac { namespace { -// Returns an autoreleased array of paths that contain plug-ins that should be +// Returns an autoreleased array of paths that contain plugins that should be // forbidden to load. Each element of the array will be a string containing // an absolute pathname ending in '/'. NSArray* BlockedPaths() { @@ -62,9 +62,9 @@ NSArray* BlockedPaths() { // loading things contained in these directories. NSString* const blocked_suffixes[] = { #if !defined(__LP64__) - // Contextual menu manager plug-ins are unavailable to 64-bit processes. + // Contextual menu manager plugins are unavailable to 64-bit processes. // http://developer.apple.com/library/mac/releasenotes/Cocoa/AppKitOlderNotes.html#NSMenu - // Contextual menu plug-ins are loaded when a contextual menu is opened, + // Contextual menu plugins are loaded when a contextual menu is opened, // for example, from within // +[NSMenu popUpContextMenu:withEvent:forView:]. @"Contextual Menu Items/", @@ -83,7 +83,7 @@ NSArray* BlockedPaths() { @"ScriptingAdditions/" // This list is intentionally incomplete. For example, it doesn't block - // printer drivers or Internet plug-ins. + // printer drivers or Internet plugins. }; NSUInteger blocked_paths_count = [blocked_prefixes count] * diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 61151eb..8fd3fc5 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -954,10 +954,10 @@ const char kPluginsAllowOutdated[] = "plugins.allow_outdated"; const char kPluginsAlwaysAuthorize[] = "plugins.always_authorize"; #if defined(ENABLE_PLUGIN_INSTALLATION) -// Dictionary holding plug-ins metadata. +// Dictionary holding plugins metadata. const char kPluginsMetadata[] = "plugins.metadata"; -// Last update time of plug-ins resource cache. +// Last update time of plugins resource cache. const char kPluginsResourceCacheUpdate[] = "plugins.resource_cache_update"; #endif @@ -1524,7 +1524,7 @@ const char kDisableVideoAndChat[] = "disable_video_chat"; // Whether Extensions are enabled. const char kDisableExtensions[] = "extensions.disabled"; -// Whether the plugin finder that lets you install missing plug-ins is enabled. +// Whether the plugin finder that lets you install missing plugins is enabled. const char kDisablePluginFinder[] = "plugins.disable_plugin_finder"; // Customized app page names that appear on the New Tab Page. diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 4a000c6..6fe1581 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -450,7 +450,7 @@ IPC_SYNC_MESSAGE_CONTROL4_1(ChromeViewHostMsg_AllowIndexedDB, // Return information about a plugin for the given URL and MIME type. // In contrast to ViewHostMsg_GetPluginInfo in content/, this IPC call knows -// about specific reasons why a plug-in can't be used, for example because it's +// about specific reasons why a plugin can't be used, for example because it's // disabled. IPC_SYNC_MESSAGE_CONTROL4_1(ChromeViewHostMsg_GetPluginInfo, int /* render_frame_id */, @@ -475,42 +475,42 @@ IPC_SYNC_MESSAGE_CONTROL1_3( #endif #if defined(ENABLE_PLUGIN_INSTALLATION) -// Tells the browser to search for a plug-in that can handle the given MIME +// Tells the browser to search for a plugin that can handle the given MIME // type. The result will be sent asynchronously to the routing ID // |placeholder_id|. IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_FindMissingPlugin, int /* placeholder_id */, std::string /* mime_type */) -// Notifies the browser that a missing plug-in placeholder has been removed, so +// Notifies the browser that a missing plugin placeholder has been removed, so // the corresponding PluginPlaceholderHost can be deleted. IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_RemovePluginPlaceholderHost, int /* placeholder_id */) -// Notifies a missing plug-in placeholder that a plug-in with name |plugin_name| +// Notifies a missing plugin placeholder that a plugin with name |plugin_name| // has been found. IPC_MESSAGE_ROUTED1(ChromeViewMsg_FoundMissingPlugin, base::string16 /* plugin_name */) -// Notifies a missing plug-in placeholder that no plug-in has been found. +// Notifies a missing plugin placeholder that no plugin has been found. IPC_MESSAGE_ROUTED0(ChromeViewMsg_DidNotFindMissingPlugin) -// Notifies a missing plug-in placeholder that we have started downloading -// the plug-in. +// Notifies a missing plugin placeholder that we have started downloading +// the plugin. IPC_MESSAGE_ROUTED0(ChromeViewMsg_StartedDownloadingPlugin) -// Notifies a missing plug-in placeholder that we have finished downloading -// the plug-in. +// Notifies a missing plugin placeholder that we have finished downloading +// the plugin. IPC_MESSAGE_ROUTED0(ChromeViewMsg_FinishedDownloadingPlugin) -// Notifies a missing plug-in placeholder that there was an error downloading -// the plug-in. +// Notifies a missing plugin placeholder that there was an error downloading +// the plugin. IPC_MESSAGE_ROUTED1(ChromeViewMsg_ErrorDownloadingPlugin, std::string /* message */) #endif // defined(ENABLE_PLUGIN_INSTALLATION) -// Notifies a missing plug-in placeholder that the user cancelled downloading -// the plug-in. +// Notifies a missing plugin placeholder that the user cancelled downloading +// the plugin. IPC_MESSAGE_ROUTED0(ChromeViewMsg_CancelledDownloadingPlugin) // Tells the browser to open chrome://plugins in a new tab. We use a separate @@ -518,11 +518,11 @@ IPC_MESSAGE_ROUTED0(ChromeViewMsg_CancelledDownloadingPlugin) // chrome:// URLs. IPC_MESSAGE_ROUTED0(ChromeViewHostMsg_OpenAboutPlugins) -// Tells the browser that there was an error loading a plug-in. +// Tells the browser that there was an error loading a plugin. IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_CouldNotLoadPlugin, base::FilePath /* plugin_path */) -// Tells the browser that we blocked a plug-in because NPAPI is not supported. +// Tells the browser that we blocked a plugin because NPAPI is not supported. IPC_MESSAGE_ROUTED1(ChromeViewHostMsg_NPAPINotSupported, std::string /* identifer */) @@ -557,13 +557,13 @@ IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_V8HeapStats, // Notifies when a plugin couldn't be loaded because it's outdated. IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_BlockedOutdatedPlugin, int /* placeholder ID */, - std::string /* plug-in group identifier */) + std::string /* plugin group identifier */) // Notifies when a plugin couldn't be loaded because it requires // user authorization. IPC_MESSAGE_ROUTED2(ChromeViewHostMsg_BlockedUnauthorizedPlugin, base::string16 /* name */, - std::string /* plug-in group identifier */) + std::string /* plugin group identifier */) // Provide the browser process with information about the WebCore resource // cache and current renderer framerate. diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index f1787b3..1158539 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -194,7 +194,7 @@ void ContentSettingsObserver::SetContentSettingRules( bool ContentSettingsObserver::IsPluginTemporarilyAllowed( const std::string& identifier) { - // If the empty string is in here, it means all plug-ins are allowed. + // If the empty string is in here, it means all plugins are allowed. // TODO(bauerb): Remove this once we only pass in explicit identifiers. return (temporarily_allowed_plugins_.find(identifier) != temporarily_allowed_plugins_.end()) || diff --git a/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html index 663b024..1600274 100644 --- a/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html +++ b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/background.html @@ -5,7 +5,7 @@ --> <script src="background.js"></script> -<h1>Native Client SRPC Simple Plug-in</h1> +<h1>Native Client SRPC Simple Plugin</h1> <p> <embed name="nacl_module" id="pluginobj" diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index fa67b20..0f22c83 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc @@ -69,7 +69,7 @@ static_assert(arraysize(kProviderSourceMap) == "kProviderSourceMap should have NUM_PROVIDER_TYPES elements"); // Returns true if the |content_type| supports a resource identifier. -// Resource identifiers are supported (but not required) for plug-ins. +// Resource identifiers are supported (but not required) for plugins. bool SupportsResourceIdentifier(ContentSettingsType content_type) { return content_type == CONTENT_SETTINGS_TYPE_PLUGINS; } diff --git a/components/nacl/renderer/nexe_load_manager.cc b/components/nacl/renderer/nexe_load_manager.cc index bb1f415..b7c9968 100644 --- a/components/nacl/renderer/nexe_load_manager.cc +++ b/components/nacl/renderer/nexe_load_manager.cc @@ -49,7 +49,7 @@ const char* const kTypeAttribute = "type"; // JSON matching ISAs with .nexe URLs). const char* const kSrcManifestAttribute = "src"; // The "nacl" attribute of the <embed> tag. We use the value of this attribute -// to find the manifest file when NaCl is registered as a plug-in for another +// to find the manifest file when NaCl is registered as a plugin for another // MIME type because the "src" attribute is used to supply us with the resource // of that MIME type that we're supposed to display. const char* const kNaClManifestAttribute = "nacl"; diff --git a/components/plugins/renderer/loadable_plugin_placeholder.cc b/components/plugins/renderer/loadable_plugin_placeholder.cc index 8a5a0aa..f4e0369 100644 --- a/components/plugins/renderer/loadable_plugin_placeholder.cc +++ b/components/plugins/renderer/loadable_plugin_placeholder.cc @@ -128,20 +128,20 @@ void LoadablePluginPlaceholder::ReplacePlugin(WebPlugin* new_plugin) { if (!new_plugin) return; WebPluginContainer* container = plugin()->container(); - // Set the new plug-in on the container before initializing it. + // Set the new plugin on the container before initializing it. container->setPlugin(new_plugin); - // Save the element in case the plug-in is removed from the page during + // Save the element in case the plugin is removed from the page during // initialization. WebElement element = container->element(); bool plugin_needs_initialization = !premade_throttler_ || new_plugin != premade_throttler_->GetWebPlugin(); if (plugin_needs_initialization && !new_plugin->initialize(container)) { - // We couldn't initialize the new plug-in. Restore the old one and abort. + // We couldn't initialize the new plugin. Restore the old one and abort. container->setPlugin(plugin()); return; } - // The plug-in has been removed from the page. Destroy the old plug-in. We + // The plugin has been removed from the page. Destroy the old plugin. We // will be destroyed as soon as V8 garbage collects us. if (!element.pluginContainer()) { plugin()->destroy(); @@ -150,8 +150,8 @@ void LoadablePluginPlaceholder::ReplacePlugin(WebPlugin* new_plugin) { placeholder_was_replaced_ = true; - // During initialization, the new plug-in might have replaced itself in turn - // with another plug-in. Make sure not to use the passed in |new_plugin| after + // During initialization, the new plugin might have replaced itself in turn + // with another plugin. Make sure not to use the passed in |new_plugin| after // this point. new_plugin = container->plugin(); @@ -312,7 +312,7 @@ void LoadablePluginPlaceholder::LoadPlugin() { void LoadablePluginPlaceholder::LoadCallback() { RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Load_Click")); #if defined(ENABLE_PLUGINS) - // If the user specifically clicks on the plug-in content's placeholder, + // If the user specifically clicks on the plugin content's placeholder, // disable power saver throttling for this instance. MarkPluginEssential(PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_CLICK); #endif diff --git a/components/plugins/renderer/loadable_plugin_placeholder.h b/components/plugins/renderer/loadable_plugin_placeholder.h index bc09b73..e67c861 100644 --- a/components/plugins/renderer/loadable_plugin_placeholder.h +++ b/components/plugins/renderer/loadable_plugin_placeholder.h @@ -11,7 +11,7 @@ #include "content/public/renderer/plugin_instance_throttler.h" namespace plugins { -// Placeholders can be used if a plug-in is missing or not available +// Placeholders can be used if a plugin is missing or not available // (blocked or disabled). class LoadablePluginPlaceholder : public PluginPlaceholder, @@ -30,7 +30,7 @@ class LoadablePluginPlaceholder power_saver_enabled_ = power_saver_enabled; } - // Defer loading of plug-in, and instead show the Power Saver poster image. + // Defer loading of plugin, and instead show the Power Saver poster image. void BlockForPowerSaverPoster(); #endif diff --git a/components/plugins/renderer/webview_plugin.h b/components/plugins/renderer/webview_plugin.h index cb3f5a6..3b7cd67 100644 --- a/components/plugins/renderer/webview_plugin.h +++ b/components/plugins/renderer/webview_plugin.h @@ -60,9 +60,9 @@ class WebViewPlugin : public blink::WebPlugin, blink::WebView* web_view() { return web_view_; } - // When loading a plug-in document (i.e. a full page plug-in not embedded in + // When loading a plugin document (i.e. a full page plugin not embedded in // another page), we save all data that has been received, and replay it with - // this method on the actual plug-in. + // this method on the actual plugin. void ReplayReceivedData(blink::WebPlugin* plugin); void RestoreTitleText(); diff --git a/content/app/strings/content_strings.grd b/content/app/strings/content_strings.grd index f8667ec..24deef1 100644 --- a/content/app/strings/content_strings.grd +++ b/content/app/strings/content_strings.grd @@ -743,8 +743,8 @@ below: Please lengthen this text to <ph name="MIN_CHARACTERS">$2<ex>101</ex></ph> characters or more (you are currently using <ph name="CURRENT_LENGTH">$1<ex>100</ex></ph> characters). </message> - <message name="IDS_PLUGIN_INITIALIZATION_ERROR" desc="A message displayed when a plug-in failed to load"> - Couldn't load plug-in. + <message name="IDS_PLUGIN_INITIALIZATION_ERROR" desc="A message displayed when a plugin failed to load"> + Couldn't load plugin. </message> </messages> diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index f74b378..019f4b0 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -212,7 +212,7 @@ class PluginDataRemoverImpl::Context kClearAllData, max_age); } - // Connects the client side of a newly opened plug-in channel. + // Connects the client side of a newly opened plugin channel. void ConnectToChannel(const IPC::ChannelHandle& handle, bool is_ppapi) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); @@ -288,7 +288,7 @@ class PluginDataRemoverImpl::Context // The name of the plugin. Use only on the I/O thread. std::string plugin_name_; - // The channel is NULL until we have opened a connection to the plug-in + // The channel is NULL until we have opened a connection to the plugin // process. scoped_ptr<IPC::Channel> channel_; }; diff --git a/content/browser/plugin_data_remover_impl.h b/content/browser/plugin_data_remover_impl.h index 704ebaa..ed2b7ea 100644 --- a/content/browser/plugin_data_remover_impl.h +++ b/content/browser/plugin_data_remover_impl.h @@ -22,9 +22,9 @@ class CONTENT_EXPORT PluginDataRemoverImpl : public PluginDataRemover { // PluginDataRemover implementation: base::WaitableEvent* StartRemoving(base::Time begin_time) override; - // The plug-in whose data should be removed (usually Flash) is specified via + // The plugin whose data should be removed (usually Flash) is specified via // its MIME type. This method sets a different MIME type in order to call a - // different plug-in (for example in tests). + // different plugin (for example in tests). void set_mime_type(const std::string& mime_type) { mime_type_ = mime_type; } private: diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 3257ac3..3d45743 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -189,8 +189,8 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) { browser_command_line.GetSwitchValueNative(switches::kPluginLauncher); #if defined(OS_MACOSX) - // Run the plug-in process in a mode tolerant of heap execution without - // explicit mprotect calls. Some plug-ins still rely on this quaint and + // Run the plugin process in a mode tolerant of heap execution without + // explicit mprotect calls. Some plugins still rely on this quaint and // archaic "feature." See http://crbug.com/93551. int flags = ChildProcessHost::CHILD_ALLOW_HEAP_EXECUTION; #elif defined(OS_LINUX) diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 6b25ed4..326eb4f 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -154,7 +154,7 @@ class CONTENT_EXPORT PluginServiceImpl // Cancels opening a channel to a NPAPI plugin. void CancelOpenChannelToNpapiPlugin(PluginProcessHost::Client* client); - // Used to monitor plug-in stability. + // Used to monitor plugin stability. void RegisterPluginCrash(const base::FilePath& plugin_path); private: @@ -240,14 +240,14 @@ class CONTENT_EXPORT PluginServiceImpl std::set<PluginProcessHost::Client*> pending_plugin_clients_; - // Used to sequentialize loading plug-ins from disk. + // Used to sequentialize loading plugins from disk. base::SequencedWorkerPool::SequenceToken plugin_list_token_; #if defined(OS_POSIX) scoped_refptr<PluginLoaderPosix> plugin_loader_; #endif - // Used to detect if a given plug-in is crashing over and over. + // Used to detect if a given plugin is crashing over and over. std::map<base::FilePath, std::vector<base::Time> > crash_times_; DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl); diff --git a/content/child/npapi/plugin_host.cc b/content/child/npapi/plugin_host.cc index c2d68aa..cdda9e4 100644 --- a/content/child/npapi/plugin_host.cc +++ b/content/child/npapi/plugin_host.cc @@ -618,12 +618,12 @@ void NPN_InvalidateRect(NPP id, NPRect *invalidRect) { // Before a windowless plugin can refresh part of its drawing area, it must // first invalidate it. This function causes the NPP_HandleEvent method to - // pass an update event or a paint message to the plug-in. After calling - // this method, the plug-in receives a paint message asynchronously. + // pass an update event or a paint message to the plugin. After calling + // this method, the plugin receives a paint message asynchronously. // The browser redraws invalid areas of the document and any windowless - // plug-ins at regularly timed intervals. To force a paint message, the - // plug-in can call NPN_ForceRedraw after calling this method. + // plugins at regularly timed intervals. To force a paint message, the + // plugin can call NPN_ForceRedraw after calling this method. scoped_refptr<PluginInstance> plugin(FindInstance(id)); if (plugin.get() && plugin->webplugin()) { @@ -665,7 +665,7 @@ void NPN_InvalidateRegion(NPP id, NPRegion invalidRegion) { } void NPN_ForceRedraw(NPP id) { - // Forces repaint for a windowless plug-in. + // Forces repaint for a windowless plugin. // // We deliberately do not implement this; we don't want plugins forcing // synchronous paints. @@ -678,7 +678,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { // NPNVxDisplay (unix only) // NPNVxtAppContext (unix only) // NPNVnetscapeWindow (win only) - Gets the native window on which the - // plug-in drawing occurs, returns HWND + // plugin drawing occurs, returns HWND // NPNVjavascriptEnabledBool: tells whether Javascript is enabled // NPNVasdEnabledBool: tells whether SmartUpdate is enabled // NPNVOfflineBool: tells whether offline-mode is enabled diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc index a99f2e1..372c3b5 100644 --- a/content/child/npapi/plugin_url_fetcher.cc +++ b/content/child/npapi/plugin_url_fetcher.cc @@ -204,7 +204,7 @@ bool PluginURLFetcher::OnReceivedRedirect( // Currently this check is just to catch an https -> http redirect when // loading the main plugin src URL. Longer term, we could investigate // firing mixed diplay or scripting issues for subresource loads - // initiated by plug-ins. + // initiated by plugins. if (is_plugin_src_load_ && !plugin_stream_->instance()->webplugin()->CheckIfRunInsecureContent( redirect_info.new_url)) { diff --git a/content/child/npapi/webplugin_delegate_impl.cc b/content/child/npapi/webplugin_delegate_impl.cc index 4041db4..9d76054 100644 --- a/content/child/npapi/webplugin_delegate_impl.cc +++ b/content/child/npapi/webplugin_delegate_impl.cc @@ -81,14 +81,14 @@ bool WebPluginDelegateImpl::Initialize( creation_succeeded_ = instance_->Start( url, argn.get(), argv.get(), argc, load_manually); if (!creation_succeeded_) { - VLOG(1) << "Couldn't start plug-in instance"; + VLOG(1) << "Couldn't start plugin instance"; return false; } windowless_ = instance_->windowless(); if (!windowless_) { if (!WindowedCreatePlugin()) { - VLOG(1) << "Couldn't create windowed plug-in"; + VLOG(1) << "Couldn't create windowed plugin"; return false; } } diff --git a/content/child/npapi/webplugin_delegate_impl.h b/content/child/npapi/webplugin_delegate_impl.h index df70584..91eddfa 100644 --- a/content/child/npapi/webplugin_delegate_impl.h +++ b/content/child/npapi/webplugin_delegate_impl.h @@ -145,7 +145,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { void SetContentAreaHasFocus(bool has_focus); #if defined(OS_WIN) - // Informs the plug-in that an IME has changed its status. + // Informs the plugin that an IME has changed its status. void ImeCompositionUpdated(const base::string16& text, const std::vector<int>& clauses, const std::vector<int>& target, @@ -155,7 +155,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { // IME was cancelled. void ImeCompositionCompleted(const base::string16& text); - // Returns the IME status retrieved from a plug-in. + // Returns the IME status retrieved from a plugin. bool GetIMEStatus(int* input_type, gfx::Rect* caret_rect); #endif @@ -304,7 +304,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { uint32 last_message_; bool is_calling_wndproc; - // An IME emulator used by a windowless plug-in to retrieve IME data through + // An IME emulator used by a windowless plugin to retrieve IME data through // IMM32 functions. scoped_ptr<WebPluginIMEWin> plugin_ime_; #endif // defined(OS_WIN) @@ -386,13 +386,13 @@ class WebPluginDelegateImpl : public WebPluginDelegate { // Informs the browser about the updated accelerated drawing surface. void UpdateAcceleratedSurface(); - // Uses a CARenderer to draw the plug-in's layer in our OpenGL surface. + // Uses a CARenderer to draw the plugin's layer in our OpenGL surface. void DrawLayerInSurface(); bool use_buffer_context_; CGContextRef buffer_context_; // Weak ref. - CALayer* layer_; // Used for CA drawing mode. Weak, retained by plug-in. + CALayer* layer_; // Used for CA drawing mode. Weak, retained by plugin. WebPluginAcceleratedSurface* surface_; // Weak ref. CARenderer* renderer_; // Renders layer_ to surface_. scoped_ptr<base::RepeatingTimer<WebPluginDelegateImpl> > redraw_timer_; diff --git a/content/child/npapi/webplugin_delegate_impl_mac.mm b/content/child/npapi/webplugin_delegate_impl_mac.mm index 8dd549c..4dad117 100644 --- a/content/child/npapi/webplugin_delegate_impl_mac.mm +++ b/content/child/npapi/webplugin_delegate_impl_mac.mm @@ -205,7 +205,7 @@ bool WebPluginDelegateImpl::PlatformInitialize() { break; case NPDrawingModelCoreAnimation: case NPDrawingModelInvalidatingCoreAnimation: { - // Ask the plug-in for the CALayer it created for rendering content. + // Ask the plugin for the CALayer it created for rendering content. // Create a surface to host it, and request a "window" handle to identify // the surface. CALayer* layer = nil; @@ -702,7 +702,7 @@ void WebPluginDelegateImpl::DrawLayerInSurface() { surface_->EndDrawing(); } -// Update the size of the surface to match the current size of the plug-in. +// Update the size of the surface to match the current size of the plugin. void WebPluginDelegateImpl::UpdateAcceleratedSurface() { if (!surface_ || !layer_) return; diff --git a/content/child/npapi/webplugin_delegate_impl_win.cc b/content/child/npapi/webplugin_delegate_impl_win.cc index 97d1f83..c7efff7 100644 --- a/content/child/npapi/webplugin_delegate_impl_win.cc +++ b/content/child/npapi/webplugin_delegate_impl_win.cc @@ -500,7 +500,7 @@ bool WebPluginDelegateImpl::WindowedCreatePlugin() { DCHECK(result == TRUE) << "SetProp failed, last error = " << GetLastError(); // Calling SetWindowLongPtrA here makes the window proc ASCII, which is - // required by at least the Shockwave Director plug-in. + // required by at least the Shockwave Director plugin. SetWindowLongPtrA(windowed_handle_, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(DefWindowProcA)); @@ -872,7 +872,7 @@ LRESULT CALLBACK WebPluginDelegateImpl::WrapperWindowProc( // window messages when its first parameter is a handle representing the // DefWindowProc() function. To avoid this problem, this code creates a // wrapper function which just encapsulates the DefWindowProc() function - // and set it as the window procedure of a windowed plug-in. + // and set it as the window procedure of a windowed plugin. return DefWindowProc(hWnd, message, wParam, lParam); } @@ -1207,8 +1207,8 @@ bool WebPluginDelegateImpl::PlatformHandleInputEvent( return false; } - // Allow this plug-in to access this IME emulator through IMM32 API while the - // plug-in is processing this event. + // Allow this plugin to access this IME emulator through IMM32 API while the + // plugin is processing this event. if (GetQuirks() & PLUGIN_QUIRK_EMULATE_IME) { if (!plugin_ime_) plugin_ime_.reset(new WebPluginIMEWin); diff --git a/content/child/npapi/webplugin_ime_win.cc b/content/child/npapi/webplugin_ime_win.cc index 9b03ab7..7ff6a5d 100644 --- a/content/child/npapi/webplugin_ime_win.cc +++ b/content/child/npapi/webplugin_ime_win.cc @@ -19,7 +19,7 @@ namespace content { -// A critical section that prevents two or more plug-ins from accessing a +// A critical section that prevents two or more plugins from accessing a // WebPluginIMEWin instance through our patch function. base::LazyInstance<base::Lock>::Leaky g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER; @@ -65,10 +65,10 @@ void WebPluginIMEWin::CompositionUpdated(const base::string16& text, events_.push_back(np_event); // Converts this event to the IMM32 data so we do not have to convert it every - // time when a plug-in call an IMM32 function. + // time when a plugin call an IMM32 function. composition_text_ = text; - // Create the composition clauses returned when a plug-in calls + // Create the composition clauses returned when a plugin calls // ImmGetCompositionString() with GCS_COMPCLAUSE. composition_clauses_.clear(); for (size_t i = 0; i < clauses.size(); ++i) @@ -107,8 +107,8 @@ void WebPluginIMEWin::CompositionCompleted(const base::string16& text) { np_event.lParam = 0; events_.push_back(np_event); - // If the target plug-in does not seem to support IME messages, we send - // each character in IME text with a WM_CHAR message so the plug-in can + // If the target plugin does not seem to support IME messages, we send + // each character in IME text with a WM_CHAR message so the plugin can // insert the IME text. if (!support_ime_messages_) { np_event.event = WM_CHAR; @@ -133,7 +133,7 @@ void WebPluginIMEWin::CompositionCompleted(const base::string16& text) { bool WebPluginIMEWin::SendEvents(PluginInstance* instance) { // We allow the patch functions to access this WebPluginIMEWin instance only - // while we send IME events to the plug-in. + // while we send IME events to the plugin. ScopedLock lock(this); bool ret = true; @@ -266,8 +266,8 @@ HIMC WINAPI WebPluginIMEWin::ImmGetContext(HWND window) { // Call the original ImmGetContext() function if the given window is the one // created in WebPluginDelegateImpl::WindowedCreatePlugin(). (We attached IME // context only with the windows created in this function.) On the other hand, - // some windowless plug-ins (such as Flash) call this function with a dummy - // window handle. We return our dummy IME context for these plug-ins so they + // some windowless plugins (such as Flash) call this function with a dummy + // window handle. We return our dummy IME context for these plugins so they // can use our IME emulator. if (IsWindow(window)) { wchar_t name[128]; diff --git a/content/child/npapi/webplugin_ime_win.h b/content/child/npapi/webplugin_ime_win.h index eca9ab2..b24e75a 100644 --- a/content/child/npapi/webplugin_ime_win.h +++ b/content/child/npapi/webplugin_ime_win.h @@ -17,14 +17,14 @@ namespace content { class PluginInstance; -// A class that emulates an IME for windowless plug-ins. A windowless plug-in +// A class that emulates an IME for windowless plugins. A windowless plugin // does not have a window. Therefore, we cannot attach an IME to a windowless -// plug-in. To allow such windowless plug-ins to use IMEs without any changes to +// plugin. To allow such windowless plugins to use IMEs without any changes to // them, this class receives the IME data from a browser and patches IMM32 -// functions to return the IME data when a windowless plug-in calls IMM32 +// functions to return the IME data when a windowless plugin calls IMM32 // functions. I would not Flash retrieves pointers to IMM32 functions with // GetProcAddress(), this class also needs a hook to GetProcAddress() to -// dispatch IMM32 function calls from a plug-in to this class as listed in the +// dispatch IMM32 function calls from a plugin to this class as listed in the // following snippet. // // FARPROC WINAPI GetProcAddressPatch(HMODULE module, LPCSTR name) { @@ -39,13 +39,13 @@ class PluginInstance; // GetPluginPath().value().c_str(), "kernel32.dll", "GetProcAddress", // GetProcAddressPatch); // -// After we successfuly dispatch IMM32 calls from a plug-in to this class, we -// need to update its IME data so the class can return it to the plug-in through +// After we successfuly dispatch IMM32 calls from a plugin to this class, we +// need to update its IME data so the class can return it to the plugin through // its IMM32 calls. To update the IME data, we call CompositionUpdated() or // CompositionCompleted() BEFORE sending an IMM32 Window message to the plugin -// with a SendEvents() call as listed in the following snippet. (Plug-ins call +// with a SendEvents() call as listed in the following snippet. (Plugins call // IMM32 functions when it receives IMM32 window messages. We need to update the -// IME data of this class before sending IMM32 messages so the plug-ins can get +// IME data of this class before sending IMM32 messages so the plugins can get // the latest data.) // // WebPluginIMEWin ime; @@ -63,12 +63,12 @@ class PluginInstance; // ime.SendEvents(instance()); // // This class also provides GetStatus() so we can retrieve the IME status -// changed by a plug-in with IMM32 functions. This function is mainly used for +// changed by a plugin with IMM32 functions. This function is mainly used for // retrieving the position of a caret. // class WebPluginIMEWin { public: - // A simple class that allows a plug-in to access a WebPluginIMEWin instance + // A simple class that allows a plugin to access a WebPluginIMEWin instance // only in a scope. class ScopedLock { public: @@ -89,17 +89,17 @@ class WebPluginIMEWin { ~WebPluginIMEWin(); // Sends raw IME events sent from a browser to this IME emulator and updates - // the list of Windows events to be sent to a plug-in. A raw IME event is + // the list of Windows events to be sent to a plugin. A raw IME event is // mapped to two or more Windows events and it is not so trivial to send these - // Windows events to a plug-in. This function inserts Windows events in the - // order expected by a plug-in. + // Windows events to a plugin. This function inserts Windows events in the + // order expected by a plugin. void CompositionUpdated(const base::string16& text, std::vector<int> clauses, std::vector<int> target, int cursor_position); void CompositionCompleted(const base::string16& text); - // Send all the events added in Update() to a plug-in. + // Send all the events added in Update() to a plugin. bool SendEvents(PluginInstance* instance); // Retrieves the status of this IME emulator. @@ -114,7 +114,7 @@ class WebPluginIMEWin { // Allow (or disallow) the patch functions to use this WebPluginIMEWin // instance through our patch functions. Our patch functions need a static // member variable |instance_| to access a WebPluginIMEWIn instance. We lock - // this static variable to prevent two or more plug-ins from accessing a + // this static variable to prevent two or more plugins from accessing a // WebPluginIMEWin instance. void Lock(); void Unlock(); @@ -136,7 +136,7 @@ class WebPluginIMEWin { CANDIDATEFORM* candidate); static BOOL WINAPI ImmSetOpenStatus(HIMC context, BOOL open); - // a list of NPEvents to be sent to a plug-in. + // a list of NPEvents to be sent to a plugin. std::vector<NPEvent> events_; // The return value for GCS_COMPSTR. @@ -164,12 +164,12 @@ class WebPluginIMEWin { // WM_IME_STARTCOMPOSITION message when we start composing IME text. bool composing_text_; - // Whether a plug-in supports IME messages. When a plug-in cannot handle + // Whether a plugin supports IME messages. When a plugin cannot handle // IME messages, we need to send the IME text with WM_CHAR messages as Windows // does. bool support_ime_messages_; - // The IME status received from a plug-in. + // The IME status received from a plugin. bool status_updated_; int input_type_; gfx::Rect caret_rect_; diff --git a/content/child/plugin_messages.h b/content/child/plugin_messages.h index 1f1a656..25d4545 100644 --- a/content/child/plugin_messages.h +++ b/content/child/plugin_messages.h @@ -305,11 +305,11 @@ IPC_SYNC_MESSAGE_ROUTED2_0(PluginHostMsg_SetWindowlessData, HANDLE /* modal_loop_pump_messages_event */, gfx::NativeViewId /* dummy_activation_window*/) -// Send the IME status retrieved from a windowless plug-in. A windowless plug-in -// uses the IME attached to a browser process as a renderer does. A plug-in +// Send the IME status retrieved from a windowless plugin. A windowless plugin +// uses the IME attached to a browser process as a renderer does. A plugin // sends this message to control the IME status of a browser process. I would -// note that a plug-in sends this message to a renderer process that hosts this -// plug-in (not directly to a browser process) so the renderer process can +// note that a plugin sends this message to a renderer process that hosts this +// plugin (not directly to a browser process) so the renderer process can // update its IME status. IPC_MESSAGE_ROUTED2(PluginHostMsg_NotifyIMEStatus, int /* input_type */, diff --git a/content/common/plugin_list.cc b/content/common/plugin_list.cc index a0f9507..7e8d1c2 100644 --- a/content/common/plugin_list.cc +++ b/content/common/plugin_list.cc @@ -278,7 +278,7 @@ void PluginList::GetPluginPathsToLoad(std::vector<base::FilePath>* plugin_paths, void PluginList::SetPlugins(const std::vector<WebPluginInfo>& plugins) { base::AutoLock lock(lock_); - // If we haven't been invalidated in the mean time, mark the plug-in list as + // If we haven't been invalidated in the mean time, mark the plugin list as // up-to-date. if (loading_state_ != LOADING_STATE_NEEDS_REFRESH) loading_state_ = LOADING_STATE_UP_TO_DATE; @@ -340,11 +340,11 @@ void PluginList::GetPluginInfoArray( } // Add in plugins by url. - // We do not permit URL-sniff based plug-in MIME type overrides aside from + // We do not permit URL-sniff based plugin MIME type overrides aside from // the case where the "type" was initially missing. // We collected stats to determine this approach isn't a major compat issue, // and we defend against content confusion attacks in various cases, such - // as when the user doesn't have the Flash plug-in enabled. + // as when the user doesn't have the Flash plugin enabled. std::string path = url.path(); std::string::size_type last_dot = path.rfind('.'); if (last_dot != std::string::npos && mime_type.empty()) { diff --git a/content/common/plugin_list.h b/content/common/plugin_list.h index 9ad67fc..26a2aa6 100644 --- a/content/common/plugin_list.h +++ b/content/common/plugin_list.h @@ -103,7 +103,7 @@ class CONTENT_EXPORT PluginList { void GetPlugins(std::vector<WebPluginInfo>* plugins, bool include_npapi); - // Copies the list of plug-ins into |plugins| without loading them. + // Copies the list of plugins into |plugins| without loading them. // Returns true if the list of plugins is up-to-date. bool GetPluginsNoRefresh(std::vector<WebPluginInfo>* plugins); @@ -116,9 +116,9 @@ class CONTENT_EXPORT PluginList { // returns plugins which support wildcard mime types (* as the mime // type). The |info| parameter is required to be non-NULL. The // list is in order of "most desirable" to "least desirable". - // If |use_stale| is NULL, this will load the plug-in list if necessary. - // If it is not NULL, the plug-in list will not be loaded, and |*use_stale| - // will be true iff the plug-in list was stale. + // If |use_stale| is NULL, this will load the plugin list if necessary. + // If it is not NULL, the plugin list will not be loaded, and |*use_stale| + // will be true iff the plugin list was stale. void GetPluginInfoArray(const GURL& url, const std::string& mime_type, bool allow_wildcard, @@ -127,7 +127,7 @@ class CONTENT_EXPORT PluginList { std::vector<WebPluginInfo>* info, std::vector<std::string>* actual_mime_types); - // Load a specific plugin with full path. Return true iff loading the plug-in + // Load a specific plugin with full path. Return true iff loading the plugin // was successful. bool LoadPluginIntoPluginList(const base::FilePath& filename, std::vector<WebPluginInfo>* plugins, @@ -212,7 +212,7 @@ class CONTENT_EXPORT PluginList { // Internals // - // States whether we will load the plug-in list the next time we try to access + // States whether we will load the plugin list the next time we try to access // it, whether we are currently in the process of loading it, or whether we // consider it up-to-date. LoadingState loading_state_; @@ -226,7 +226,7 @@ class CONTENT_EXPORT PluginList { // Holds information about internal plugins. std::vector<WebPluginInfo> internal_plugins_; - // A list holding all plug-ins. + // A list holding all plugins. std::vector<WebPluginInfo> plugins_list_; // Callback that is invoked whenever the PluginList will reload the plugins. diff --git a/content/common/process_type.cc b/content/common/process_type.cc index d3c6894..34019d4 100644 --- a/content/common/process_type.cc +++ b/content/common/process_type.cc @@ -16,7 +16,7 @@ std::string GetProcessTypeNameInEnglish(int type) { case PROCESS_TYPE_RENDERER: return "Tab"; case PROCESS_TYPE_PLUGIN: - return "Plug-in"; + return "Plugin"; case PROCESS_TYPE_UTILITY: return "Utility"; case PROCESS_TYPE_ZYGOTE: diff --git a/content/common/sandbox_init_mac.h b/content/common/sandbox_init_mac.h index 5407081..4bbabb3 100644 --- a/content/common/sandbox_init_mac.h +++ b/content/common/sandbox_init_mac.h @@ -7,7 +7,7 @@ namespace content { -// Initialize the sandbox for renderer, gpu, utility, worker, and plug-in +// Initialize the sandbox for renderer, gpu, utility, worker, and plugin // processes, depending on the command line flags. For the browser process which // is not sandboxed, this call is a no-op. // Returns true if the sandbox was initialized succesfully, false if an error diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 81003fc..21f76ea 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -605,8 +605,8 @@ bool WebPluginProxy::CheckIfRunInsecureContent(const GURL& url) { #if defined(OS_WIN) && !defined(USE_AURA) void WebPluginProxy::UpdateIMEStatus() { - // Retrieve the IME status from a plug-in and send it to a renderer process - // when the plug-in has updated it. + // Retrieve the IME status from a plugin and send it to a renderer process + // when the plugin has updated it. int input_type; gfx::Rect caret_rect; if (!delegate_->GetIMEStatus(&input_type, &caret_rect)) diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index e1fb45d..458921a 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -131,7 +131,7 @@ class WebPluginProxy : public WebPlugin, void OnResourceCreated(int resource_id, WebPluginResourceClient* client); #if defined(OS_WIN) && !defined(USE_AURA) - // Retrieves the IME status from a windowless plug-in and sends it to a + // Retrieves the IME status from a windowless plugin and sends it to a // renderer process. A renderer process will convert the coordinates from // local to the window coordinates and send the converted coordinates to a // browser process. diff --git a/content/public/browser/plugin_data_remover.h b/content/public/browser/plugin_data_remover.h index 02d3acd..e242cf2 100644 --- a/content/public/browser/plugin_data_remover.h +++ b/content/public/browser/plugin_data_remover.h @@ -24,10 +24,10 @@ class CONTENT_EXPORT PluginDataRemover { static PluginDataRemover* Create(content::BrowserContext* browser_context); virtual ~PluginDataRemover() {} - // Starts removing plug-in data stored since |begin_time|. + // Starts removing plugin data stored since |begin_time|. virtual base::WaitableEvent* StartRemoving(base::Time begin_time) = 0; - // Returns a list of all plug-ins that support removing LSO data. This method + // Returns a list of all plugins that support removing LSO data. This method // will use cached plugin data. Call PluginService::GetPlugins() if the latest // data is needed. static void GetSupportedPlugins(std::vector<WebPluginInfo>* plugins); diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h index 9121e68..9420f3e 100644 --- a/content/public/browser/plugin_service.h +++ b/content/public/browser/plugin_service.h @@ -53,7 +53,7 @@ class PluginService { // Must be called on the instance to finish initialization. virtual void Init() = 0; - // Starts watching for changes in the list of installed plug-ins. + // Starts watching for changes in the list of installed plugins. virtual void StartWatchingPlugins() = 0; // Gets the plugin in the list of plugins that matches the given url and mime @@ -108,7 +108,7 @@ class PluginService { // If the plugin with the given path is running, cleanly shuts it down. virtual void ForcePluginShutdown(const base::FilePath& plugin_path) = 0; - // Used to monitor plug-in stability. An unstable plug-in is one that has + // Used to monitor plugin stability. An unstable plugin is one that has // crashed more than a set number of times in a set time period. virtual bool IsPluginUnstable(const base::FilePath& plugin_path) = 0; diff --git a/content/public/browser/plugin_service_filter.h b/content/public/browser/plugin_service_filter.h index fda9d33..b6266c1 100644 --- a/content/public/browser/plugin_service_filter.h +++ b/content/public/browser/plugin_service_filter.h @@ -14,7 +14,7 @@ class FilePath; namespace content { struct WebPluginInfo; -// Callback class to let the client filter the list of all installed plug-ins +// Callback class to let the client filter the list of all installed plugins // and block them from being loaded. // This class is called on the FILE thread. class PluginServiceFilter { diff --git a/content/public/common/child_process_host.h b/content/public/common/child_process_host.h index 67a39ac..c79938b 100644 --- a/content/public/common/child_process_host.h +++ b/content/public/common/child_process_host.h @@ -64,7 +64,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Sender { // Requests that the child run in a process that does not protect the // heap against execution. Normally, heap pages may be made executable // with mprotect, so this mode should be used sparingly. It is intended - // for processes that may host plug-ins that expect an executable heap + // for processes that may host plugins that expect an executable heap // without having to call mprotect. This option is currently incompatible // with CHILD_NO_PIE. CHILD_ALLOW_HEAP_EXECUTION = 1 << 2, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index df52d50..b32db22 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -212,7 +212,7 @@ const char kDisablePepper3d[] = "disable-pepper-3d"; // Disables compositor-accelerated touch-screen pinch gestures. const char kDisablePinch[] = "disable-pinch"; -// Disable discovering third-party plug-ins. Effectively loading only +// Disable discovering third-party plugins. Effectively loading only // ones shipped with the browser plus third-party ones as specified by // --extra-plugin-dir and --load-plugin switches. const char kDisablePluginsDiscovery[] = "disable-plugins-discovery"; diff --git a/content/public/common/sandbox_init.h b/content/public/common/sandbox_init.h index 34f366a..bd12ff8 100644 --- a/content/public/common/sandbox_init.h +++ b/content/public/common/sandbox_init.h @@ -28,7 +28,7 @@ class SandboxedProcessLauncherDelegate; #if defined(OS_WIN) -// Initialize the sandbox for renderer, gpu, utility, worker, nacl, and plug-in +// Initialize the sandbox for renderer, gpu, utility, worker, nacl, and plugin // processes, depending on the command line flags. Although The browser process // is not sandboxed, this also needs to be called because it will initialize // the broker code. diff --git a/content/public/common/webplugininfo.h b/content/public/common/webplugininfo.h index 2912cef..c84b924 100644 --- a/content/public/common/webplugininfo.h +++ b/content/public/common/webplugininfo.h @@ -68,7 +68,7 @@ struct CONTENT_EXPORT WebPluginInfo { (type == PLUGIN_TYPE_PEPPER_UNSANDBOXED)); } - // Parse a version string as used by a plug-in. This method is more lenient + // Parse a version string as used by a plugin. This method is more lenient // in accepting weird version strings than base::Version::GetFromString() static void CreateVersionFromString(const base::string16& version_string, base::Version* parsed_version); diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 27dca47..45176ab 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -106,7 +106,7 @@ class CONTENT_EXPORT ContentRendererClient { const blink::WebPluginParams& params, blink::WebPlugin** plugin); - // Creates a replacement plug-in that is shown when the plug-in at |file_path| + // Creates a replacement plugin that is shown when the plugin at |file_path| // couldn't be loaded. This allows the embedder to show a custom placeholder. virtual blink::WebPlugin* CreatePluginReplacement( RenderFrame* render_frame, diff --git a/content/public/renderer/render_process_observer.h b/content/public/renderer/render_process_observer.h index de23dae..582a60f 100644 --- a/content/public/renderer/render_process_observer.h +++ b/content/public/renderer/render_process_observer.h @@ -30,7 +30,7 @@ class CONTENT_EXPORT RenderProcessObserver { // Called right after the WebKit API is initialized. virtual void WebKitInitialized() {} - // Called when the renderer cache of the plug-in list has changed. + // Called when the renderer cache of the plugin list has changed. virtual void PluginListChanged() {} virtual void IdleNotification() {} diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index 66bc362..8e83b86 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -311,13 +311,13 @@ bool WebPluginDelegateProxy::Initialize( if (!info_.path.empty()) { render_view_->GetMainRenderFrame()->PluginCrashed( info_.path, base::kNullProcessId); - LOG(ERROR) << "Plug-in crashed on start"; + LOG(ERROR) << "Plugin crashed on start"; // Return true so that the plugin widget is created and we can paint the // crashed plugin there. return true; } - LOG(ERROR) << "Plug-in couldn't be found"; + LOG(ERROR) << "Plugin couldn't be found"; return false; } @@ -801,7 +801,7 @@ void WebPluginDelegateProxy::ImeCompositionUpdated( const std::vector<int>& target, int cursor_position, int plugin_id) { - // Dispatch the raw IME data if this plug-in is the focused one. + // Dispatch the raw IME data if this plugin is the focused one. if (instance_id_ != plugin_id) return; @@ -813,7 +813,7 @@ void WebPluginDelegateProxy::ImeCompositionUpdated( void WebPluginDelegateProxy::ImeCompositionCompleted(const base::string16& text, int plugin_id) { - // Dispatch the IME text if this plug-in is the focused one. + // Dispatch the IME text if this plugin is the focused one. if (instance_id_ != plugin_id) return; diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index bb92c76..9a447fe 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc @@ -917,7 +917,7 @@ void WebPluginImpl::willSendRequest(WebURLLoader* loader, // Currently this check is just to catch an https -> http redirect when // loading the main plugin src URL. Longer term, we could investigate // firing mixed diplay or scripting issues for subresource loads - // initiated by plug-ins. + // initiated by plugins. if (client_info->is_plugin_src_load && webframe_ && !webframe_->checkIfRunInsecureContent(request.url())) { diff --git a/content/renderer/pepper/plugin_instance_throttler_impl.cc b/content/renderer/pepper/plugin_instance_throttler_impl.cc index 1ff6248..097480d 100644 --- a/content/renderer/pepper/plugin_instance_throttler_impl.cc +++ b/content/renderer/pepper/plugin_instance_throttler_impl.cc @@ -157,7 +157,7 @@ void PluginInstanceThrottlerImpl::OnImageFlush(const SkBitmap* bitmap) { bool PluginInstanceThrottlerImpl::ConsumeInputEvent( const blink::WebInputEvent& event) { - // Always allow right-clicks through so users may verify it's a plug-in. + // Always allow right-clicks through so users may verify it's a plugin. // TODO(tommycli): We should instead show a custom context menu (probably // using PluginPlaceholder) so users aren't confused and try to click the // Flash-internal 'Play' menu item. This is a stopgap solution. diff --git a/content/renderer/pepper/plugin_power_saver_helper.cc b/content/renderer/pepper/plugin_power_saver_helper.cc index 9eec693..2891980 100644 --- a/content/renderer/pepper/plugin_power_saver_helper.cc +++ b/content/renderer/pepper/plugin_power_saver_helper.cc @@ -32,13 +32,13 @@ enum PeripheralHeuristicDecision { const char kPeripheralHeuristicHistogram[] = "Plugin.PowerSaver.PeripheralHeuristic"; -// Maximum dimensions plug-in content may have while still being considered +// Maximum dimensions plugin content may have while still being considered // peripheral content. These match the sizes used by Safari. const int kPeripheralContentMaxWidth = 400; const int kPeripheralContentMaxHeight = 300; -// Plug-in content below this size in height and width is considered "tiny". -// Tiny content is never peripheral, as tiny plug-ins often serve a critical +// Plugin content below this size in height and width is considered "tiny". +// Tiny content is never peripheral, as tiny plugins often serve a critical // purpose, and the user often cannot find and click to unthrottle it. const int kPeripheralContentTinySize = 5; diff --git a/content/renderer/pepper/ppb_broker_impl.h b/content/renderer/pepper/ppb_broker_impl.h index 0f74855..b43d3a6 100644 --- a/content/renderer/pepper/ppb_broker_impl.h +++ b/content/renderer/pepper/ppb_broker_impl.h @@ -40,7 +40,7 @@ class PPB_Broker_Impl : public ppapi::Resource, scoped_refptr<ppapi::TrackedCallback> connect_callback) override; int32_t GetHandle(int32_t* handle) override; - // Returns the URL of the document this plug-in runs in. This is necessary to + // Returns the URL of the document this plugin runs in. This is necessary to // decide whether to grant access to the PPAPI broker. GURL GetDocumentUrl(); diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 4e8819c..a306861 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -776,10 +776,10 @@ void RenderThreadImpl::Shutdown() { bool RenderThreadImpl::Send(IPC::Message* msg) { // Certain synchronous messages cannot always be processed synchronously by // the browser, e.g., putting up UI and waiting for the user. This could cause - // a complete hang of Chrome if a windowed plug-in is trying to communicate + // a complete hang of Chrome if a windowed plugin is trying to communicate // with the renderer thread since the browser's UI thread could be stuck // (within a Windows API call) trying to synchronously communicate with the - // plug-in. The remedy is to pump messages on this thread while the browser + // plugin. The remedy is to pump messages on this thread while the browser // is processing this request. This creates an opportunity for re-entrancy // into WebKit, so we need to take care to disable callbacks, timers, and // pending network loads that could trigger such callbacks. diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 2fe1417..3fcbc28 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -3448,8 +3448,8 @@ void RenderViewImpl::OnImeSetComposition( } #if defined(OS_WIN) - // When a plug-in has focus, we create platform-specific IME data used by - // our IME emulator and send it directly to the focused plug-in, i.e. we + // When a plugin has focus, we create platform-specific IME data used by + // our IME emulator and send it directly to the focused plugin, i.e. we // bypass WebKit. (WebPluginDelegate dispatches this IME data only when its // instance ID is the same one as the specified ID.) if (focused_plugin_id_ >= 0) { @@ -3491,7 +3491,7 @@ void RenderViewImpl::OnImeConfirmComposition( } #if defined(OS_WIN) // Same as OnImeSetComposition(), we send the text from IMEs directly to - // plug-ins. When we send IME text directly to plug-ins, we should not send + // plugins. When we send IME text directly to plugins, we should not send // it to WebKit to prevent WebKit from controlling IMEs. // TODO(thakis): Honor |replacement_range| for plugins? if (focused_plugin_id_ >= 0) { diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index b4d9e57..d844217 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -282,7 +282,7 @@ class CONTENT_EXPORT RenderViewImpl // Returns true if the focused element is editable text from the perspective // of IME support (also used for on-screen keyboard). Works correctly inside - // supported PPAPI plug-ins. + // supported PPAPI plugins. bool HasIMETextFocus(); // Callback for use with GetWindowSnapshot. @@ -970,7 +970,7 @@ class CONTENT_EXPORT RenderViewImpl std::set<WebPluginDelegateProxy*> plugin_delegates_; #if defined(OS_WIN) - // The ID of the focused NPAPI plug-in. + // The ID of the focused NPAPI plugin. int focused_plugin_id_; #endif diff --git a/content/shell/tools/plugin/PluginObject.cpp b/content/shell/tools/plugin/PluginObject.cpp index b071c09..a3c723f 100644 --- a/content/shell/tools/plugin/PluginObject.cpp +++ b/content/shell/tools/plugin/PluginObject.cpp @@ -437,7 +437,7 @@ static bool testDOMAccess(PluginObject* obj, const NPVariant*, uint32_t, NPVariant* result) { - // Get plug-in's DOM element + // Get plugin's DOM element NPObject* elementObject; if (browser->getvalue(obj->npp, NPNVPluginElementNPObject, &elementObject) == NPERR_NO_ERROR) { diff --git a/content/shell/tools/plugin/PluginObjectMac.mm b/content/shell/tools/plugin/PluginObjectMac.mm index e95e541..d69908b 100644 --- a/content/shell/tools/plugin/PluginObjectMac.mm +++ b/content/shell/tools/plugin/PluginObjectMac.mm @@ -40,7 +40,7 @@ - (void)drawInContext:(CGContextRef)context { CGRect bounds = [self bounds]; - const char* text = "Test Plug-in"; + const char* text = "Test Plugin"; CGContextSelectFont(context, "Helvetica", 24, kCGEncodingMacRoman); CGContextShowTextAtPoint(context, bounds.origin.x + 3.0f, diff --git a/content/shell/tools/plugin/PluginTest.cpp b/content/shell/tools/plugin/PluginTest.cpp index ddaab7e..d0a56c7 100644 --- a/content/shell/tools/plugin/PluginTest.cpp +++ b/content/shell/tools/plugin/PluginTest.cpp @@ -72,7 +72,7 @@ void PluginTest::registerNPShutdownFunction(void (*func)()) { void PluginTest::indicateTestFailure() { // This should really be an assert, but there's no way for the test framework -// to know that the plug-in process crashed, so we'll just sleep for a while +// to know that the plugin process crashed, so we'll just sleep for a while // to ensure that the test times out. #if defined(XP_WIN) ::Sleep(100000); @@ -124,7 +124,7 @@ bool PluginTest::NPP_URLNotify(const char* url, NPReason, void* notifyData) { } NPError PluginTest::NPP_GetValue(NPPVariable variable, void* value) { - // We don't know anything about plug-in values so just return + // We don't know anything about plugin values so just return // NPERR_GENERIC_ERROR. return NPERR_GENERIC_ERROR; } diff --git a/content/shell/tools/plugin/PluginTest.h b/content/shell/tools/plugin/PluginTest.h index 0929ba9..82093ae 100644 --- a/content/shell/tools/plugin/PluginTest.h +++ b/content/shell/tools/plugin/PluginTest.h @@ -158,7 +158,7 @@ class PluginTest { protected: PluginTest(NPP npp, const std::string& identifier); - // FIXME: A plug-in test shouldn't need to know about it's NPP. Make this + // FIXME: A plugin test shouldn't need to know about it's NPP. Make this // private. NPP m_npp; diff --git a/content/shell/tools/plugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp b/content/shell/tools/plugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp index e9131a7..cfbc2cd 100644 --- a/content/shell/tools/plugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp +++ b/content/shell/tools/plugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp @@ -34,7 +34,7 @@ using namespace std; // From NPP_New, call NPN_GetURLNotify with a URL that fails to load (NPP_NewStream won't be called). -// The plug-in should still get a NPP_URLNotify indicating that the load failed. +// The plugin should still get a NPP_URLNotify indicating that the load failed. static const char *urlThatFailsToLoad = "foo://bar/"; class GetURLNotifyWithURLThatFailsToLoad : public PluginTest { diff --git a/content/shell/tools/plugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp b/content/shell/tools/plugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp index 37ad4a5..4e7470f 100644 --- a/content/shell/tools/plugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp +++ b/content/shell/tools/plugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp @@ -31,7 +31,7 @@ using namespace std; -// From NPP_New, call NPN_GetURL to evaluate JavaScript that destroys the plug-in. +// From NPP_New, call NPN_GetURL to evaluate JavaScript that destroys the plugin. class GetURLWithJavaScriptURLDestroyingPlugin : public PluginTest { public: diff --git a/content/shell/tools/plugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp b/content/shell/tools/plugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp index 8f42d6c..488c859 100644 --- a/content/shell/tools/plugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp +++ b/content/shell/tools/plugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp @@ -31,7 +31,7 @@ using namespace std; -// A test where the plug-ins scriptable object either has or doesn't have an invokeDefault function. +// A test where the plugins scriptable object either has or doesn't have an invokeDefault function. class PluginScriptableNPObjectInvokeDefault : public PluginTest { public: PluginScriptableNPObjectInvokeDefault(NPP npp, const string& identifier) diff --git a/content/shell/tools/plugin/main.cpp b/content/shell/tools/plugin/main.cpp index 0b1e55f..fb682b3 100644 --- a/content/shell/tools/plugin/main.cpp +++ b/content/shell/tools/plugin/main.cpp @@ -840,7 +840,7 @@ NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value) return NPERR_NO_ERROR; } if (variable == NPPVpluginDescriptionString) { - *((char **)value) = const_cast<char*>("Simple Netscape® plug-in that handles test content for WebKit"); + *((char **)value) = const_cast<char*>("Simple Netscape® plugin that handles test content for WebKit"); return NPERR_NO_ERROR; } if (variable == NPPVpluginNeedsXEmbed) { diff --git a/content/test/plugin/npapi_test.cc b/content/test/plugin/npapi_test.cc index 975de43..02e9093 100644 --- a/content/test/plugin/npapi_test.cc +++ b/content/test/plugin/npapi_test.cc @@ -94,7 +94,7 @@ EXPORT NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, break; case NPPVpluginDescriptionString: *(static_cast<const char**>(value)) = - "Simple NPAPI plug-in for Chromium unit tests"; + "Simple NPAPI plugin for Chromium unit tests"; break; case NPPVpluginNeedsXEmbed: *(static_cast<NPBool*>(value)) = true; diff --git a/content/test/plugin/plugin_client.h b/content/test/plugin/plugin_client.h index 07d9a70..3b5ef3e 100644 --- a/content/test/plugin/plugin_client.h +++ b/content/test/plugin/plugin_client.h @@ -20,17 +20,17 @@ class PluginClient { // NPAPI Host to call. static NPError GetEntryPoints(NPPluginFuncs* pFuncs); - // The browser calls this function only once: when a plug-in is loaded, + // The browser calls this function only once: when a plugin is loaded, // before the first instance is created. This is the first function that - // the browser calls. NP_Initialize tells the plug-in that the browser has + // the browser calls. NP_Initialize tells the plugin that the browser has // loaded it and provides global initialization. Allocate any memory or - // resources shared by all instances of your plug-in at this time. + // resources shared by all instances of your plugin at this time. static NPError Initialize(NPNetscapeFuncs* pFuncs); // The browser calls this function once after the last instance of your - // plug-in is destroyed, before unloading the plug-in library itself. Use + // plugin is destroyed, before unloading the plugin library itself. Use // NP_Shutdown to delete any data allocated in NP_Initialize to be shared - // by all instances of a plug-in. + // by all instances of a plugin. static NPError Shutdown(); // The table of functions provided by the host. diff --git a/content/test/plugin/plugin_setup_test.h b/content/test/plugin/plugin_setup_test.h index 98452a9..1708ce1 100644 --- a/content/test/plugin/plugin_setup_test.h +++ b/content/test/plugin/plugin_setup_test.h @@ -9,7 +9,7 @@ namespace NPAPIClient { -// A very simple test that just sets up a new plug-in. +// A very simple test that just sets up a new plugin. class PluginSetupTest : public PluginTest { public: // Constructor. diff --git a/content/test/plugin/plugin_thread_async_call_test.cc b/content/test/plugin/plugin_thread_async_call_test.cc index 096041c..4afd0042 100644 --- a/content/test/plugin/plugin_thread_async_call_test.cc +++ b/content/test/plugin/plugin_thread_async_call_test.cc @@ -67,7 +67,7 @@ NPError PluginThreadAsyncCallTest::New( // a different thread to fully test it. if (this == g_short_lived_instance) { // This is slightly complicated thanks to the Linux shared library build, - // which shares more compilation units between the NPAPI plug-in and + // which shares more compilation units between the NPAPI plugin and // the base code. at_exit_manager_ = new base::ShadowingAtExitManager(); base::Thread random_thread("random_thread"); diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 7551818..a22005e 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -119,8 +119,8 @@ void UtilityThreadImpl::OnLoadPlugins( PluginList* plugin_list = PluginList::Singleton(); std::vector<WebPluginInfo> plugins; - // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in - // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins + // TODO(bauerb): If we restart loading plugins, we might mess up the logic in + // PluginList::ShouldLoadPlugin due to missing the previously loaded plugins // in |plugin_groups|. for (size_t i = 0; i < plugin_paths.size(); ++i) { WebPluginInfo plugin; diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h index 16691b4..d897d29 100644 --- a/extensions/browser/process_manager.h +++ b/extensions/browser/process_manager.h @@ -120,7 +120,7 @@ class ProcessManager : public KeyedService, // called regularly. void KeepaliveImpulse(const Extension* extension); - // Triggers a keepalive impulse for a plug-in (e.g NaCl). + // Triggers a keepalive impulse for a plugin (e.g NaCl). static void OnKeepaliveFromPlugin(int render_process_id, int render_frame_id, const std::string& extension_id); diff --git a/ios/web/public/web_client.h b/ios/web/public/web_client.h index d4bd2b0..e8ac0c8 100644 --- a/ios/web/public/web_client.h +++ b/ios/web/public/web_client.h @@ -72,7 +72,7 @@ class WebClient { // browser would return true for "chrome://about" URL. virtual bool IsAppSpecificURL(const GURL& url) const; - // Returns text to be displayed for an unsupported plug-in. + // Returns text to be displayed for an unsupported plugin. virtual base::string16 GetPluginNotSupportedText() const; // Returns a string describing the embedder product name and version, of the diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm index e0bb96e..b35729d 100644 --- a/media/video/capture/mac/video_capture_device_mac.mm +++ b/media/video/capture/mac/video_capture_device_mac.mm @@ -118,7 +118,7 @@ static bool FindDeviceInterfaceInUsbDevice( const int product_id, const io_service_t usb_device, IOUSBDeviceInterface*** device_interface) { - // Create a plug-in, i.e. a user-side controller to manipulate USB device. + // Create a plugin, i.e. a user-side controller to manipulate USB device. IOCFPlugInInterface** plugin; SInt32 score; // Unused, but required for IOCreatePlugInInterfaceForService. kern_return_t kr = @@ -133,7 +133,7 @@ static bool FindDeviceInterfaceInUsbDevice( } base::mac::ScopedIOPluginInterface<IOCFPlugInInterface> plugin_ref(plugin); - // Fetch the Device Interface from the plug-in. + // Fetch the Device Interface from the plugin. HRESULT res = (*plugin)->QueryInterface(plugin, CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), @@ -179,7 +179,7 @@ static bool FindVideoControlInterfaceInDeviceInterface( } base::mac::ScopedIOObject<io_service_t> found_interface_ref(found_interface); - // Create a user side controller (i.e. a "plug-in") for the found interface. + // Create a user side controller (i.e. a "plugin") for the found interface. SInt32 score; kr = IOCreatePlugInInterfaceForService(found_interface, kIOUSBInterfaceUserClientTypeID, @@ -198,8 +198,8 @@ static bool FindVideoControlInterfaceInDeviceInterface( static void SetAntiFlickerInVideoControlInterface( IOCFPlugInInterface** plugin_interface, const int frequency) { - // Create, the control interface for the found plug-in, and release - // the intermediate plug-in. + // Create, the control interface for the found plugin, and release + // the intermediate plugin. IOUSBInterfaceInterface** control_interface = NULL; HRESULT res = (*plugin_interface)->QueryInterface( plugin_interface, diff --git a/ppapi/api/dev/ppp_zoom_dev.idl b/ppapi/api/dev/ppp_zoom_dev.idl index e8254da..2398f75 100644 --- a/ppapi/api/dev/ppp_zoom_dev.idl +++ b/ppapi/api/dev/ppp_zoom_dev.idl @@ -16,7 +16,7 @@ label Chrome { */ interface PPP_Zoom_Dev { /** - * Instruct plug-in to zoom according to the given factor and whether the zoom + * Instruct plugin to zoom according to the given factor and whether the zoom * only applies to text only. The scale factor is the percentage divided by * 100, i.e. 150% zoom is 1.5. */ diff --git a/ppapi/c/dev/ppp_zoom_dev.h b/ppapi/c/dev/ppp_zoom_dev.h index d70fcdd..0cc39ea 100644 --- a/ppapi/c/dev/ppp_zoom_dev.h +++ b/ppapi/c/dev/ppp_zoom_dev.h @@ -31,7 +31,7 @@ */ struct PPP_Zoom_Dev_0_3 { /** - * Instruct plug-in to zoom according to the given factor and whether the zoom + * Instruct plugin to zoom according to the given factor and whether the zoom * only applies to text only. The scale factor is the percentage divided by * 100, i.e. 150% zoom is 1.5. */ diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html index 5795572..529c974 100644 --- a/ppapi/tests/test_case.html +++ b/ppapi/tests/test_case.html @@ -300,7 +300,7 @@ onload = function() { } else { document.getElementById("console").innerHTML = '<span class="fail">FAIL</span>: ' + - '<span class="err_msg">Test plug-in is not registered.</span>'; + '<span class="err_msg">Test plugin is not registered.</span>'; } } diff --git a/third_party/libusb/src/libusb/os/darwin_usb.c b/third_party/libusb/src/libusb/os/darwin_usb.c index 07d6d61..f95706a 100644 --- a/third_party/libusb/src/libusb/os/darwin_usb.c +++ b/third_party/libusb/src/libusb/os/darwin_usb.c @@ -1195,7 +1195,7 @@ static int darwin_claim_interface(struct libusb_device_handle *dev_handle, int i kresult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID), (LPVOID)&cInterface->interface); - /* We no longer need the intermediate plug-in */ + /* We no longer need the intermediate plugin */ /* Use release instead of IODestroyPlugInInterface to avoid stopping IOServices associated with this device */ (*plugInInterface)->Release (plugInInterface); if (kresult || !cInterface->interface) { diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index aec11da..8d42450 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -197,11 +197,11 @@ typedef char* NPMIMEType; #endif /* __LP64__ */ /* - * NPP is a plug-in's opaque instance handle + * NPP is a plugin's opaque instance handle */ typedef struct _NPP { - void* pdata; /* plug-in private data */ + void* pdata; /* plugin private data */ void* ndata; /* netscape private data */ } NPP_t; @@ -209,7 +209,7 @@ typedef NPP_t* NPP; typedef struct _NPStream { - void* pdata; /* plug-in private data */ + void* pdata; /* plugin private data */ void* ndata; /* netscape private data */ const char* url; uint32_t end; @@ -387,7 +387,7 @@ typedef enum { /* Browsers can retrieve a native ATK accessibility plug ID via this variable. */ NPPVpluginNativeAccessibleAtkPlugId = 19, - /* Checks to see if the plug-in would like the browser to load the "src" attribute. */ + /* Checks to see if the plugin would like the browser to load the "src" attribute. */ NPPVpluginCancelSrcStream = 20, NPPVsupportsAdvancedKeyHandling = 21, @@ -399,7 +399,7 @@ typedef enum { , NPPVpluginDrawingModel = 1000 /* Used for negotiating event models */ , NPPVpluginEventModel = 1001 - /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */ + /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plugin for a Core Animation layer. */ , NPPVpluginCoreAnimationLayer = 1003 #endif diff --git a/third_party/npapi/bindings/npfunctions.h b/third_party/npapi/bindings/npfunctions.h index 02a54be..f755b04 100644 --- a/third_party/npapi/bindings/npfunctions.h +++ b/third_party/npapi/bindings/npfunctions.h @@ -227,8 +227,8 @@ enum typedef struct _BPSupportedMIMETypes { SInt32 structVersion; /* struct version */ - Handle typeStrings; /* STR# formated handle, allocated by plug-in */ - Handle infoStrings; /* STR# formated handle, allocated by plug-in */ + Handle typeStrings; /* STR# formated handle, allocated by plugin */ + Handle infoStrings; /* STR# formated handle, allocated by plugin */ } BPSupportedMIMETypes; OSErr BP_GetSupportedMIMETypes(BPSupportedMIMETypes *mimeInfo, UInt32 flags); #define NP_GETMIMEDESCRIPTION_NAME "NP_GetMIMEDescription" diff --git a/tools/json_schema_compiler/test/content_settings.json b/tools/json_schema_compiler/test/content_settings.json index 6fac436..f8778fa 100644 --- a/tools/json_schema_compiler/test/content_settings.json +++ b/tools/json_schema_compiler/test/content_settings.json @@ -195,7 +195,7 @@ }, "plugins": { "$ref": "ContentSetting", - "description": "Whether to run plug-ins. One of<br><var>allow</var>: Run plug-ins automatically,<br><var>block</var>: Don't run plug-ins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.", + "description": "Whether to run plugins. One of<br><var>allow</var>: Run plugins automatically,<br><var>block</var>: Don't run plugins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.", "value": [ "plugins", {"type":"string", "enum": ["allow", "block"]} |