diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
| commit | bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 (patch) | |
| tree | 51387d1614b16fcf107004649d44707d271da339 /chrome/browser/component_updater | |
| parent | 8a142c18176c4e279012cb218f060cfc3df087c5 (diff) | |
| download | chromium_org-bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3.tar.gz | |
Merge from Chromium at DEPS revision r213605
This commit was generated by merge_to_master.py.
Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
Diffstat (limited to 'chrome/browser/component_updater')
5 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/component_updater/DEPS b/chrome/browser/component_updater/DEPS index 37c1ed17e5..2c90430c80 100644 --- a/chrome/browser/component_updater/DEPS +++ b/chrome/browser/component_updater/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+ppapi/shared_impl/ppapi_permissions.h", "+third_party/widevine" ] diff --git a/chrome/browser/component_updater/component_patcher_win.cc b/chrome/browser/component_updater/component_patcher_win.cc index 76a72c5d04..d583819241 100644 --- a/chrome/browser/component_updater/component_patcher_win.cc +++ b/chrome/browser/component_updater/component_patcher_win.cc @@ -10,7 +10,8 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/process_util.h" +#include "base/process/kill.h" +#include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/win/scoped_handle.h" #include "chrome/installer/util/util_constants.h" diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index cd1ee8ef4d..1a5bc76dce 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -30,7 +30,6 @@ #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/omaha_query_params/omaha_query_params.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/utility_process_host.h" @@ -359,7 +358,6 @@ class CrxUpdateService : public ComponentUpdateService { base::OneShotTimer<CrxUpdateService> timer_; const Version chrome_version_; - const std::string prod_id_; bool running_; @@ -375,8 +373,6 @@ CrxUpdateService::CrxUpdateService(ComponentUpdateService::Configurator* config) config->PingUrl(), config->RequestContext())), chrome_version_(chrome::VersionInfo().Version()), - prod_id_(chrome::OmahaQueryParams::GetProdIdString( - chrome::OmahaQueryParams::CHROME)), running_(false) { } diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 0897fe640b..d9ac58c0fc 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -34,6 +34,7 @@ #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" #include "ppapi/c/private/ppb_pdf.h" +#include "ppapi/shared_impl/ppapi_permissions.h" #include "webkit/common/plugins/ppapi/ppapi_utils.h" #include "webkit/plugins/plugin_constants.h" diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index 625afd60a2..db620feac4 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc @@ -14,7 +14,7 @@ #include "base/path_service.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/process_util.h" +#include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/browser/component_updater/component_updater_service.h" |