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

Unified Diff: chrome/browser/chromeos/customization_document.h

Issue 144363006: Expand VPD initial_locale to a list of locales. Use the expanded VPD initial_locale on the OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 6 years, 11 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/chromeos/customization_document.h
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 09b0b56776997529c118ff5bdded7e9047b360f1..627ec2f83c2c4051f444f979c75d5874c07a3960 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -76,7 +76,13 @@ class StartupCustomizationDocument : public CustomizationDocument {
// These methods can be called even if !IsReady(), in this case VPD values
// will be returned.
+ //
+ // Raw value of "initial_locale" like initial_locale="en-US,sv,da,fi,no" .
const std::string& initial_locale() const { return initial_locale_; }
+ // Vector of individual locale values.
Nikita (slow) 2014/01/30 13:23:28 nit: Insert empty line before comment (same below)
Alexander Alekseev 2014/01/31 12:46:54 Done.
+ const std::vector<std::string>& configured_locales() const;
+ // configured_locales().front() - default locale value.
Nikita (slow) 2014/01/30 13:23:28 Please rewrite comment and remove configured_local
Alexander Alekseev 2014/01/31 12:46:54 Done.
+ const std::string& initial_locale_default() const;
const std::string& initial_timezone() const { return initial_timezone_; }
const std::string& keyboard_layout() const { return keyboard_layout_; }
@@ -101,6 +107,7 @@ class StartupCustomizationDocument : public CustomizationDocument {
void InitFromMachineStatistic(const char* attr, std::string* value);
std::string initial_locale_;
+ std::vector<std::string> configured_locales_;
std::string initial_timezone_;
std::string keyboard_layout_;
std::string registration_url_;

Powered by Google App Engine
This is Rietveld 408576698