ChromeOS: implement per-user time zone preferences.

chrome/browser/chromeos/extensions/info_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/info_private_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 308 matching lines @@
       default:
         return base::MakeUnique<base::Value>(kDeviceTypeChromedevice);
     }
   }
 
   if (property_name == kPropertyClientId) {
     return base::MakeUnique<base::Value>(GetClientId());
   }
 
   if (property_name == kPropertyTimezone) {
-    // TODO(crbug.com/697817): Convert CrosSettings::Get to take a unique_ptr.
-    return base::WrapUnique<base::Value>(
-        chromeos::CrosSettings::Get()
-            ->GetPref(chromeos::kSystemTimezone)
-            ->DeepCopy());
+    if (chromeos::system::PerUserTimezoneEnabled()) {
+      return base::WrapUnique<base::Value>(
+          Profile::FromBrowserContext(context_)
+              ->GetPrefs()
+              ->GetUserPrefValue(prefs::kUserTimezone)
+              ->DeepCopy());
+    } else {

[stevenjb, 2017/05/25 22:13:06]

no else after return
Also, ideally the PerUserTimezoneEnabled() check might be better handled in a
helper function instead of scattered across the code like this, e.g. in
timezone_util.

[Alexander Alekseev, 2017/05/29 21:10:23]

Done.

+      // TODO(crbug.com/697817): Convert CrosSettings::Get to take a unique_ptr.
+      return base::WrapUnique<base::Value>(
+          chromeos::CrosSettings::Get()
+              ->GetPref(chromeos::kSystemTimezone)
+              ->DeepCopy());
+    }
   }
 
   if (property_name == kPropertySupportedTimezones) {
     std::unique_ptr<base::ListValue> values =
         chromeos::system::GetTimezoneList();
     // TODO(crbug.com/703565): remove std::move() once Xcode 9.0+ is required.
     return std::move(values);
   }
 
   const char* pref_name = GetBoolPrefNameForApiProperty(property_name.c_str());
@@ skipping 12 matching lines @@
 
 ChromeosInfoPrivateSetFunction::~ChromeosInfoPrivateSetFunction() {
 }
 
 ExtensionFunction::ResponseAction ChromeosInfoPrivateSetFunction::Run() {
   std::string param_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &param_name));
   if (param_name == kPropertyTimezone) {
     std::string param_value;
     EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &param_value));
-    chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone,
-                                       base::Value(param_value));
+    if (chromeos::system::PerUserTimezoneEnabled()) {
+      Profile::FromBrowserContext(context_)->GetPrefs()->SetString(
+          prefs::kUserTimezone, param_value);
+    } else {
+      chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone,
+                                         base::Value(param_value));
+    }
   } else {
     const char* pref_name = GetBoolPrefNameForApiProperty(param_name.c_str());
     if (pref_name) {
       bool param_value;
       EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(1, &param_value));
       Profile::FromBrowserContext(context_)->GetPrefs()->SetBoolean(
           pref_name,
           param_value);
     } else {
       return RespondNow(Error(kPropertyNotFound, param_name));
     }
   }
 
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions