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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

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

Patch Set: Final rebase to ToT before hitting the CQ. Created 9 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/stats_options_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

index ec3e26cd8f75e595a55f94ccfee30b10c40363b4..934941003cac320169dc04506ff55be80fb31c18 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -54,8 +54,7 @@

static const char kOtherNetworksFakePath[] = "?";

-InternetOptionsHandler::InternetOptionsHandler()

- : chromeos::CrosOptionsPageUIHandler(NULL) {

+InternetOptionsHandler::InternetOptionsHandler() {

registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,

content::NotificationService::AllSources());

registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED,

@@ -349,8 +348,9 @@ void InternetOptionsHandler::GetLocalizedValues(

l10n_util::GetStringUTF16(IDS_CLOSE));

localized_strings->SetString("ownerOnly", l10n_util::GetStringUTF16(

IDS_OPTIONS_ACCOUNTS_OWNER_ONLY));

- localized_strings->SetString("ownerUserId", UTF8ToUTF16(

- chromeos::UserCrosSettingsProvider::cached_owner()));

+ std::string owner;

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

+ localized_strings->SetString("ownerUserId", UTF8ToUTF16(owner));

FillNetworkInfo(localized_strings);

}

@@ -585,7 +585,7 @@ void InternetOptionsHandler::Observe(

int type,

const content::NotificationSource& source,

const content::NotificationDetails& details) {

- chromeos::CrosOptionsPageUIHandler::Observe(type, source, details);

+ OptionsPageUIHandler::Observe(type, source, details);

if (type == chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED) {

base::FundamentalValue require_pin(*content::Details<bool>(details).ptr());

web_ui_->CallJavascriptFunction(