chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 7867044: PART1: Initiated the SignedSettings refactoring.

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments and issues. Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_impl.cc ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | chrome/browser/ui/webui/crashes_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

index ae096085974154ff3bfbe10f794c174cf1366481..b6c6cfe3845222b1734f4912ecffca1ba5ee9f83 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -11,12 +11,12 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/io_thread.h"

+#include "chrome/browser/chromeos/cros_settings.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/power_library.h"

#include "chrome/browser/chromeos/login/user_manager.h"

#include "chrome/browser/chromeos/login/webui_login_display.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/chromeos/user_cros_settings_provider.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/net/gaia/gaia_urls.h"

@@ -264,10 +264,12 @@ void SigninScreenHandler::ShowSigninScreenIfReady() {

if (!app_locale.empty())

params.SetString("hl", app_locale);

Mattias Nissler (ping if slow) 2011/09/26 17:26:37 put a TODO here as well saying that we need to obs

pastarmovj 2011/09/29 15:15:03 Done.

- params.SetBoolean("createAccount",

- UserCrosSettingsProvider::cached_allow_new_user());

- params.SetBoolean("guestSignin",

- UserCrosSettingsProvider::cached_allow_guest());

+ bool allow_new_user;

+ CrosSettings::Get()->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);

+ params.SetBoolean("createAccount", allow_new_user);

+ bool allow_guest;

+ CrosSettings::Get()->GetBoolean(kAccountsPrefAllowGuest, &allow_guest);

+ params.SetBoolean("guestSignin", allow_guest);

params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url());

// Test automation data:

@@ -385,7 +387,9 @@ void SigninScreenHandler::SendUserList(bool animated) {

for (UserVector::const_iterator it = users.begin();

it != users.end(); ++it) {

const std::string& email = it->email();

- bool is_owner = email == UserCrosSettingsProvider::cached_owner();

+ std::string owner;

+ chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);

+ bool is_owner = (email == owner);

if (non_owner_count < max_non_owner_users || is_owner) {

DictionaryValue* user_dict = new DictionaryValue();

« chrome/browser/profiles/profile_impl.cc ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | chrome/browser/ui/webui/crashes_ui.cc » ('J')