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

Unified Diff: chrome/browser/component_updater/pepper_flash_component_installer.cc

Issue 2300883002: Revert of Allow component-updated Flash to override the placeholder fake Flash even if (Closed)
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 606eab479be78fed21c607ff4cc7c434553e5b3a..2a84cefd2e3c34b059421bfcc45b81f8a629ed61 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -28,7 +28,6 @@
#include "build/build_config.h"
#include "chrome/browser/plugins/plugin_prefs.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pepper_flash.h"
@@ -114,18 +113,9 @@
std::vector<content::WebPluginInfo> plugins;
PluginService::GetInstance()->GetInternalPlugins(&plugins);
- base::FilePath placeholder_path =
- base::FilePath::FromUTF8Unsafe(ChromeContentClient::kNotPresent)
for (const auto& plugin : plugins) {
if (!plugin.is_pepper_plugin() || plugin.name != web_plugin.name)
continue;
-
- if (plugin.path == placeholder_path) {
- // This is the Flash placeholder; replace it regardless of version or
- // other considerations.
- PluginService::GetInstance()->UnregisterInternalPlugin(plugin.path);
- break;
- }
Version registered_version(base::UTF16ToUTF8(plugin.version));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698