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 015840710999d6f7564002255b868ef2423ea087..87679b183b19e85f6b1697c02e5de029350946fc 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc |
@@ -55,8 +55,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, |
@@ -359,8 +358,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); |
} |
@@ -563,7 +563,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) { |
bool require_pin = *Details<bool>(details).ptr(); |
DictionaryValue dictionary; |