PART1: Initiated the SignedSettings refactoring.

chrome/browser/chromeos/login/user_controller.cc

 // Copyright (c) 2011 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/login/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/login/existing_user_view.h"
 #include "chrome/browser/chromeos/login/guest_user_view.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/user_view.h"
 #include "chrome/browser/chromeos/login/username_view.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/background.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/focus/focus_manager.h"
@@ skipping 18 matching lines @@
 #endif
 
 // Vertical interval between the image and the textfield.
 const int kVerticalIntervalSize = 10;
 
 void CloseWindow(views::Widget* window) {
   if (window)
     window->CloseNow();
 }
 
+// Helper function to initialize the is_owner_ const field of UserController.
+bool VerifyOwnership(const std::string& email) {
+  // Empty owner string means that owner hasn't been cached yet, not that owner
+  // has an empty email.
+  // TODO(pastarmovj): Consider switching to TrustedGet here.
+  std::string owner;
+  return CrosSettings::Get()->GetString(kDeviceOwner, &owner) &&
+         (email == owner);
+}
+
 }  // namespace
 
 // WidgetDelegate implementation for the Widget used for the controls.
 class UserController::ControlsWidgetDelegate : public views::WidgetDelegate {
  public:
   ControlsWidgetDelegate(UserController* controller,
                          views::View* view)
       : controller_(controller),
         view_(view) {
   }
@@ skipping 50 matching lines @@
       user_input_(NULL),
       throbber_host_(NULL) {
 }
 
 UserController::UserController(Delegate* delegate,
                                const UserManager::User& user)
     : user_index_(-1),
       is_user_selected_(false),
       is_new_user_(false),
       is_guest_(false),
-      // Empty 'cached_owner()' means that owner hasn't been cached yet, not
-      // that owner has an empty email.
-      is_owner_(user.email() == UserCrosSettingsProvider::cached_owner()),
+      is_owner_(VerifyOwnership(user.email())),
       show_name_tooltip_(false),
       user_(user),
       delegate_(delegate),
       controls_widget_(NULL),
       image_widget_(NULL),
       border_window_(NULL),
       label_widget_(NULL),
       unselected_label_widget_(NULL),
       user_view_(NULL),
       label_view_(NULL),
@@ skipping 381 matching lines @@
 string16 UserController::GetNameTooltip() const {
   if (is_new_user_)
     return l10n_util::GetStringUTF16(IDS_ADD_USER);
   else if (is_guest_)
     return l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON);
   else
     return UTF8ToUTF16(user_.GetNameTooltip());
 }
 
 }  // namespace chromeos