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

Side by Side Diff: chrome/browser/component_updater/chrome_component_updater_configurator.cc

Issue 2873533002: Prepare to abstract PersistedData by making it part of the configurator.
Patch Set: Really fix a compile error in iOS component configurator this time. Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h" 5 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "base/task_scheduler/post_task.h" 11 #include "base/task_scheduler/post_task.h"
12 #include "base/version.h" 12 #include "base/version.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/component_updater/component_patcher_operation_out_of_pr ocess.h" 15 #include "chrome/browser/component_updater/component_patcher_operation_out_of_pr ocess.h"
16 #include "chrome/browser/component_updater/component_updater_utils.h" 16 #include "chrome/browser/component_updater/component_updater_utils.h"
17 #include "chrome/browser/google/google_brand.h" 17 #include "chrome/browser/google/google_brand.h"
18 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h" 18 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
19 #include "chrome/common/channel_info.h" 19 #include "chrome/common/channel_info.h"
20 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "components/component_updater/configurator_impl.h" 21 #include "components/component_updater/configurator_impl.h"
22 #include "components/prefs/pref_registry_simple.h" 22 #include "components/prefs/pref_registry_simple.h"
23 #include "components/prefs/pref_service.h" 23 #include "components/prefs/pref_service.h"
24 #include "components/update_client/persisted_data.h"
24 #include "components/update_client/update_query_params.h" 25 #include "components/update_client/update_query_params.h"
25 26
26 #if defined(OS_WIN) 27 #if defined(OS_WIN)
27 #include "base/win/win_util.h" 28 #include "base/win/win_util.h"
28 #include "chrome/installer/util/google_update_settings.h" 29 #include "chrome/installer/util/google_update_settings.h"
29 #endif 30 #endif
30 31
31 namespace component_updater { 32 namespace component_updater {
32 33
33 namespace { 34 namespace {
(...skipping 23 matching lines...) Expand all
57 scoped_refptr<update_client::OutOfProcessPatcher> CreateOutOfProcessPatcher() 58 scoped_refptr<update_client::OutOfProcessPatcher> CreateOutOfProcessPatcher()
58 const override; 59 const override;
59 bool EnabledDeltas() const override; 60 bool EnabledDeltas() const override;
60 bool EnabledComponentUpdates() const override; 61 bool EnabledComponentUpdates() const override;
61 bool EnabledBackgroundDownloader() const override; 62 bool EnabledBackgroundDownloader() const override;
62 bool EnabledCupSigning() const override; 63 bool EnabledCupSigning() const override;
63 scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() 64 scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
64 const override; 65 const override;
65 PrefService* GetPrefService() const override; 66 PrefService* GetPrefService() const override;
66 bool IsPerUserInstall() const override; 67 bool IsPerUserInstall() const override;
68 update_client::PersistedData* CreateMetadata() const override;
67 69
68 private: 70 private:
69 friend class base::RefCountedThreadSafe<ChromeConfigurator>; 71 friend class base::RefCountedThreadSafe<ChromeConfigurator>;
70 72
71 ConfiguratorImpl configurator_impl_; 73 ConfiguratorImpl configurator_impl_;
72 PrefService* pref_service_; // This member is not owned by this class. 74 PrefService* pref_service_; // This member is not owned by this class.
73 75
74 ~ChromeConfigurator() override {} 76 ~ChromeConfigurator() override {}
75 }; 77 };
76 78
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 193
192 PrefService* ChromeConfigurator::GetPrefService() const { 194 PrefService* ChromeConfigurator::GetPrefService() const {
193 DCHECK(pref_service_); 195 DCHECK(pref_service_);
194 return pref_service_; 196 return pref_service_;
195 } 197 }
196 198
197 bool ChromeConfigurator::IsPerUserInstall() const { 199 bool ChromeConfigurator::IsPerUserInstall() const {
198 return component_updater::IsPerUserInstall(); 200 return component_updater::IsPerUserInstall();
199 } 201 }
200 202
203 update_client::PersistedData* ChromeConfigurator::CreateMetadata() const {
204 return new update_client::PersistedData(GetPrefService());
205 }
206
201 } // namespace 207 } // namespace
202 208
203 void RegisterPrefsForChromeComponentUpdaterConfigurator( 209 void RegisterPrefsForChromeComponentUpdaterConfigurator(
204 PrefRegistrySimple* registry) { 210 PrefRegistrySimple* registry) {
205 // The component updates are enabled by default, if the preference is not set. 211 // The component updates are enabled by default, if the preference is not set.
206 registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, true); 212 registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, true);
207 } 213 }
208 214
209 scoped_refptr<update_client::Configurator> 215 scoped_refptr<update_client::Configurator>
210 MakeChromeComponentUpdaterConfigurator( 216 MakeChromeComponentUpdaterConfigurator(
211 const base::CommandLine* cmdline, 217 const base::CommandLine* cmdline,
212 net::URLRequestContextGetter* context_getter, 218 net::URLRequestContextGetter* context_getter,
213 PrefService* pref_service) { 219 PrefService* pref_service) {
214 return new ChromeConfigurator(cmdline, context_getter, pref_service); 220 return new ChromeConfigurator(cmdline, context_getter, pref_service);
215 } 221 }
216 222
217 } // namespace component_updater 223 } // namespace component_updater
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698