3 files changed, 14 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index e6f37a0..56eb520 100644
--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -92,12 +92,12 @@ ProxySettingsUI::ProxySettingsUI(content::WebUI* web_ui)
   // |localized_strings| will be owned by ProxySettingsHTMLSource.
   base::DictionaryValue* localized_strings = new base::DictionaryValue();
 
+  web_ui->AddMessageHandler(core_handler_);
   core_handler_->set_handlers_host(this);
   core_handler_->GetLocalizedValues(localized_strings);
-  web_ui->AddMessageHandler(core_handler_);
 
-  proxy_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(proxy_handler_);
+  proxy_handler_->GetLocalizedValues(localized_strings);
 
   bool keyboard_driven_oobe =
       system::keyboard_settings::ForceKeyboardDrivenUINavigation();
diff --git a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc
index f813cb5..03f2f7f 100644
--- a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc
+++ b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc
@@ -7,6 +7,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -14,7 +15,8 @@
 namespace chromeos {
 
 void AddAccountUITweaksLocalizedValues(
-    base::DictionaryValue* localized_strings) {
+    base::DictionaryValue* localized_strings,
+    Profile* profile) {
   DCHECK(localized_strings);
 
   std::string owner_email;
@@ -25,7 +27,7 @@ void AddAccountUITweaksLocalizedValues(
   localized_strings->SetString("ownerUserId", display_email);
 
   localized_strings->SetBoolean("currentUserIsOwner",
-      UserManager::Get()->IsCurrentUserOwner());
+      ProfileHelper::IsOwnerProfile(profile));
 
   localized_strings->SetBoolean("loggedInAsGuest",
       UserManager::Get()->IsLoggedInAsGuest());
@@ -35,10 +37,11 @@ void AddAccountUITweaksLocalizedValues(
 }
 
 void AddAccountUITweaksLocalizedValues(
-    content::WebUIDataSource* source) {
+    content::WebUIDataSource* source,
+    Profile* profile) {
   DCHECK(source);
   base::DictionaryValue dict;
-  AddAccountUITweaksLocalizedValues(&dict);
+  AddAccountUITweaksLocalizedValues(&dict, profile);
   source->AddLocalizedStrings(dict);
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.h b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.h
index 25a7f73..271085a 100644
--- a/chrome/browser/ui/webui/chromeos/ui_account_tweaks.h
+++ b/chrome/browser/ui/webui/chromeos/ui_account_tweaks.h
@@ -8,6 +8,8 @@
 #include "base/values.h"
 #include "base/compiler_specific.h"
 
+class Profile;
+
 namespace content {
 class WebUIDataSource;
 }
@@ -20,7 +22,7 @@ namespace chromeos {
  * @param localized_strings non-null dictionary that will be filled.
  */
 void AddAccountUITweaksLocalizedValues(
-    base::DictionaryValue* localized_strings);
+    base::DictionaryValue* localized_strings, Profile* profile);
 
 /**
  * Fills given data source with account status data (whether current user is
@@ -28,7 +30,8 @@ void AddAccountUITweaksLocalizedValues(
  * @param source non-null ui data source which localized values dictionary will
  * be filled.
  */
-void AddAccountUITweaksLocalizedValues(content::WebUIDataSource* source);
+void AddAccountUITweaksLocalizedValues(content::WebUIDataSource* source,
+                                       Profile* profile);
 
 }  // namespace chromeos