Owner is allowed as a secondary user. chrome://settings honors profile now.

chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.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/ui/webui/options/chromeos/core_chromeos_options_handler.h"
 
 #include <string>
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/user_manager/user_manager.h"
@@ skipping 187 matching lines @@
         pref_name, value, &proxy_config_service_);
     base::StringValue proxy_type(pref_name);
     web_ui()->CallJavascriptFunction(
         "options.internet.DetailsInternetPage.updateProxySettings",
         proxy_type);
     ProcessUserMetric(value, metric);
     return;
   }
   if (!CrosSettings::IsCrosSettings(pref_name))
     return ::options::CoreOptionsHandler::SetPref(pref_name, value, metric);
-  CrosSettings::Get()->Set(pref_name, *value);
+  Profile* profile = Profile::FromWebUI(web_ui());
+  OwnerSettingsServiceChromeOS* service =
+      profile ? OwnerSettingsServiceChromeOSFactory::GetForProfile(profile)
+              : nullptr;
+  if (service && service->HandlesSetting(pref_name))
+    service->Set(pref_name, *value);
+  else
+    CrosSettings::Get()->Set(pref_name, *value);

[Nikita (slow), 2014/10/27 16:44:38]

Which settings still go through CrosSettings?

[ygorshenin1, 2014/10/27 18:29:21]

Not so many:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

 
   ProcessUserMetric(value, metric);
 }
 
 void CoreChromeOSOptionsHandler::StopObservingPref(const std::string& path) {
   if (proxy_cros_settings_parser::IsProxyPref(path))
     return;  // We unregister those in the destructor.
   // Unregister this instance from observing prefs of chrome os settings.
   if (CrosSettings::IsCrosSettings(path))
     pref_subscription_map_.erase(path);
@@ skipping 145 matching lines @@
     proxy_cros_settings_parser::GetProxyPrefValue(
         proxy_config_service_, kProxySettings[i], &value);
     DCHECK(value);
     scoped_ptr<base::Value> ptr(value);
     DispatchPrefChangeNotification(kProxySettings[i], ptr.Pass());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos