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

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

Issue 2434103005: Do not replace up-to-date System Flash with Component Flash. (Closed)
Patch Set: Through #10 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/files/file_util_win.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/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 f388d21c06f7c5bcac4f7365fa7f4f2138d794e5..9cf819654e08724ec8dd661c528ea38da00585dd 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -129,28 +129,9 @@ void RegisterPepperFlashWithChrome(const base::FilePath& path,
base::Version registered_version(base::UTF16ToUTF8(plugin.version));
- // If lower version, never register.
+ // If lower or equal version, never register.
if (registered_version.IsValid() &&
- version.CompareTo(registered_version) < 0) {
- return;
- }
-
- bool registered_is_debug_system =
- !system_flash_path.empty() &&
- base::FilePath::CompareEqualIgnoreCase(plugin.path.value(),
- system_flash_path.value()) &&
- chrome::IsSystemFlashScriptDebuggerPresent();
- bool is_on_network = false;
-#if defined(OS_WIN)
- // On Windows, component updated DLLs can't load off network drives.
- // See crbug.com/572131 for details.
- is_on_network = base::IsOnNetworkDrive(path);
-#endif
- // If equal version, register iff component is not on a network drive,
- // and the version of flash is not debug system.
- if (registered_version.IsValid() &&
- version.CompareTo(registered_version) == 0 &&
- (is_on_network || registered_is_debug_system)) {
+ version.CompareTo(registered_version) <= 0) {
return;
}
« no previous file with comments | « base/files/file_util_win.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698