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

Unified Diff: chrome/browser/ui/webui/plugins_ui.cc

Issue 1255943002: One-time migration of NPAPI Flash to PPAPI Flash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use correct plugin name on OS X Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_prefs_factory.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/plugins_ui.cc
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
index 9d5d8241d8bf49675e8fdbc9ef69fa2b7cde0246..6826844584b35794a11dd2f16ce58f32faf9be73 100644
--- a/chrome/browser/ui/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -376,9 +376,11 @@ void PluginsDOMHandler::PluginsLoaded(
base::string16 desc = group_plugin.desc;
if (group_plugin.is_pepper_plugin() &&
group_plugin.name == base::ASCIIToUTF16(content::kFlashPluginName)) {
- base::FilePath system_path;
- PathService::Get(chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN, &system_path);
- if (group_plugin.path.DirName() == system_path) {
+ base::FilePath system_flash_path;
+ PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+ &system_flash_path);
+ if (base::FilePath::CompareEqualIgnoreCase(group_plugin.path.value(),
+ system_flash_path.value())) {
#if defined(GOOGLE_CHROME_BUILD)
// Existing documentation for debugging Flash describe this plugin as
// "Debug" so preserve this nomenclature here.
« no previous file with comments | « chrome/browser/plugins/plugin_prefs_factory.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698