| Index: chrome/browser/metrics/variations/variations_service.cc
|
| diff --git a/chrome/browser/metrics/variations/variations_service.cc b/chrome/browser/metrics/variations/variations_service.cc
|
| index e19b4521644b5fa0c81d021ea3ec5ddf85664951..a549295155d9d24f41964c1644e08104ac8c4740 100644
|
| --- a/chrome/browser/metrics/variations/variations_service.cc
|
| +++ b/chrome/browser/metrics/variations/variations_service.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/version.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/metrics/metrics_state_manager.h"
|
| +#include "chrome/browser/metrics/variations/generated_resources_map.h"
|
| #include "chrome/browser/network_time/network_time_tracker.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -35,6 +36,7 @@
|
| #include "net/url_request/url_fetcher.h"
|
| #include "net/url_request/url_request_status.h"
|
| #include "ui/base/device_form_factor.h"
|
| +#include "ui/base/resource/resource_bundle.h"
|
| #include "url/gurl.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -198,6 +200,17 @@ base::Time GetReferenceDateForExpiryChecks(PrefService* local_state) {
|
| return reference_date;
|
| }
|
|
|
| +// Overrides the string resource sepecified by |hash| with |string| in the
|
| +// resource bundle. Used as a callback passed to the variations seed processor.
|
| +void OverrideUIString(uint32_t hash, const base::string16& string) {
|
| + int resource_id = GetResourceIndex(hash);
|
| + if (resource_id == -1)
|
| + return;
|
| +
|
| + ui::ResourceBundle::GetSharedInstance().OverrideLocaleStringResource(
|
| + resource_id, string);
|
| +}
|
| +
|
| } // namespace
|
|
|
| VariationsService::VariationsService(
|
| @@ -249,7 +262,8 @@ bool VariationsService::CreateTrialsFromSeed() {
|
| VariationsSeedProcessor().CreateTrialsFromSeed(
|
| seed, g_browser_process->GetApplicationLocale(),
|
| GetReferenceDateForExpiryChecks(local_state_), current_version,
|
| - GetChannelForVariations(), GetCurrentFormFactor(), GetHardwareClass());
|
| + GetChannelForVariations(), GetCurrentFormFactor(), GetHardwareClass(),
|
| + base::Bind(&OverrideUIString));
|
|
|
| // Log the "freshness" of the seed that was just used. The freshness is the
|
| // time between the last successful seed download and now.
|
|
|