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: Addressed comments from Chris and rebased to ToT to get it running on the try servers again. Created 9 years, 2 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/ui/webui/options/chromeos/core_chromeos_options_handler.h ('K') | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.h ('k') | chrome/browser/ui/webui/options/chromeos/proxy_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 85cedb0ac4f2df6e8a9c739afc481a4c38b7bc8c..d981b0a99f00020bd889c195fc1b561441a70614 100644

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

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

@@ -56,8 +56,7 @@

static const char kOtherNetworksFakePath[] = "?";

InternetOptionsHandler::InternetOptionsHandler()

- : chromeos::CrosOptionsPageUIHandler(NULL),

- proxy_settings_(NULL) {

+ : proxy_settings_(NULL) {

registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,

NotificationService::AllSources());

registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED,

@@ -360,8 +359,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);

}

@@ -578,7 +578,7 @@ void InternetOptionsHandler::OnCellularDataPlanChanged(

void InternetOptionsHandler::Observe(int type,

const NotificationSource& source,

const 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(*Details<bool>(details).ptr());

web_ui_->CallJavascriptFunction(