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

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

Issue 12494029: Disable Pepper Flash component updater on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 71edeefb245ec8e14bf9385d1b36277f0d9cf478..09cb79a4758d185bcc3bffb404291833f7e788cf 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -84,7 +84,7 @@ base::FilePath GetPepperFlashBaseDirectory() {
return result;
}
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
// Pepper Flash plugins have the version encoded in the path itself
// so we need to enumerate the directories to find the full path.
// On success, |latest_dir| returns something like:
@@ -332,7 +332,7 @@ bool CheckPepperFlashManifest(base::DictionaryValue* manifest,
namespace {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
void FinishPepperFlashUpdateRegistration(ComponentUpdateService* cus,
const Version& version) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -379,12 +379,12 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
file_util::Delete(*iter, true);
}
}
-#endif // defined(GOOGLE_CHROME_BUILD)
+#endif // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
} // namespace
void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
cpu_(ooo_6.6-7.5) 2013/03/19 00:54:17 I think you only need to ifdef this function. Do y
yzshen1 2013/03/19 16:27:09 In CL https://chromiumcodereview.appspot.com/10977
// Component updated flash supersedes bundled flash therefore if that one
// is disabled then this one should never install.
CommandLine* cmd_line = CommandLine::ForCurrentProcess();
« 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