Plugins page in BWSI session has unnecessary and misleading UI components

chrome/browser/ui/webui/options2/chromeos/accounts_options_handler2.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/options2/chromeos/accounts_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 // Adds specified user to the whitelist. Returns false if that user is already
 // in the whitelist.
@@ skipping 43 matching lines @@
       IDS_OPTIONS_ACCOUNTS_SHOW_USER_NAMES_ON_SINGIN_DESCRIPTION));
   localized_strings->SetString("username_edit_hint",l10n_util::GetStringUTF16(
       IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT));
   localized_strings->SetString("username_format",l10n_util::GetStringUTF16(
       IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT));
   localized_strings->SetString("add_users",l10n_util::GetStringUTF16(
       IDS_OPTIONS_ACCOUNTS_ADD_USERS));
   localized_strings->SetString("owner_only", l10n_util::GetStringUTF16(
       IDS_OPTIONS_ACCOUNTS_OWNER_ONLY));
 
-  std::string owner_email;
-  CrosSettings::Get()->GetString(kDeviceOwner, &owner_email);
-  // Translate owner's email to the display email.
-  std::string display_email =
-      UserManager::Get()->GetUserDisplayEmail(owner_email);
-  localized_strings->SetString("owner_user_id", UTF8ToUTF16(display_email));
-
-  localized_strings->SetString("current_user_is_owner",
-      UserManager::Get()->IsCurrentUserOwner() ?
-      ASCIIToUTF16("true") : ASCIIToUTF16("false"));
   localized_strings->SetString("whitelist_is_managed",
       g_browser_process->browser_policy_connector()->IsEnterpriseManaged() ?
-          ASCIIToUTF16("true") : ASCIIToUTF16("false"));
+      ASCIIToUTF16("true") : ASCIIToUTF16("false"));
+
+  AddAccountUITweaksLocalizedValues(localized_strings);
 }
 
 void AccountsOptionsHandler::HandleWhitelistUser(const base::ListValue* args) {
   std::string typed_email;
   std::string name;
   if (!args->GetString(0, &typed_email) ||
       !args->GetString(1, &name)) {
     return;
   }
 
@@ skipping 17 matching lines @@
   DCHECK(args && args->empty());
 
   const UserList& users = UserManager::Get()->GetUsers();
   for (UserList::const_iterator it = users.begin(); it < users.end(); ++it) {
     WhitelistUser((*it)->email());
   }
 }
 
 }  // namespace options2
 }  // namespace chromeos