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

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

Issue 375973003: Componentize component_updater: Use Configurator to build query parameters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix one gyp omission Created 6 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
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 70219e9da14c187f998ad725cddcb159de374de7..8661fff7d1193603f8667ef1db35c4e6effcfd01 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -26,10 +26,10 @@
#include "chrome/browser/component_updater/flash_component_installer.h"
#include "chrome/browser/component_updater/ppapi_utils.h"
#include "chrome/browser/plugins/plugin_prefs.h"
-#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pepper_flash.h"
+#include "components/component_updater/component_updater_constants.h"
+#include "components/component_updater/component_updater_switches.h"
+#include "components/component_updater/pepper_flash.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/plugin_service.h"
#include "content/public/common/content_constants.h"
@@ -366,8 +366,10 @@ bool PepperFlashComponentInstaller::Install(
return false;
if (current_version_.CompareTo(version) > 0)
return false;
- if (!base::PathExists(unpack_path.Append(chrome::kPepperFlashPluginFilename)))
+ if (!base::PathExists(unpack_path.Append(
+ component_updater::kPepperFlashPluginFilename))) {
return false;
+ }
// Passed the basic tests. Time to install it.
base::FilePath path =
GetPepperFlashBaseDirectory().AppendASCII(version.GetString());
@@ -379,7 +381,7 @@ bool PepperFlashComponentInstaller::Install(
// and to the plugin service.
current_version_ = version;
PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
- path = path.Append(chrome::kPepperFlashPluginFilename);
+ path = path.Append(component_updater::kPepperFlashPluginFilename);
BrowserThread::PostTask(
BrowserThread::UI,
FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698