diff options
Diffstat (limited to 'chrome/browser/chromeos')
13 files changed, 90 insertions, 90 deletions
diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc index 315c37d..b945f02 100644 --- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc @@ -24,14 +24,14 @@ AccountsOptionsHandler::~AccountsOptionsHandler() { } void AccountsOptionsHandler::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("whitelistUser", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("whitelistUser", NewCallback(this, &AccountsOptionsHandler::WhitelistUser)); - dom_ui_->RegisterMessageCallback("unwhitelistUser", + web_ui_->RegisterMessageCallback("unwhitelistUser", NewCallback(this, &AccountsOptionsHandler::UnwhitelistUser)); - dom_ui_->RegisterMessageCallback("fetchUserPictures", + web_ui_->RegisterMessageCallback("fetchUserPictures", NewCallback(this, &AccountsOptionsHandler::FetchUserPictures)); - dom_ui_->RegisterMessageCallback("whitelistExistingUsers", + web_ui_->RegisterMessageCallback("whitelistExistingUsers", NewCallback(this, &AccountsOptionsHandler::WhitelistExistingUsers)); } @@ -100,7 +100,7 @@ void AccountsOptionsHandler::FetchUserPictures(const ListValue* args) { } } - dom_ui_->CallJavascriptFunction(L"AccountsOptions.setUserPictures", + web_ui_->CallJavascriptFunction(L"AccountsOptions.setUserPictures", user_pictures); } @@ -121,7 +121,7 @@ void AccountsOptionsHandler::WhitelistExistingUsers(const ListValue* args) { } } - dom_ui_->CallJavascriptFunction(L"AccountsOptions.addUsers", whitelist_users); + web_ui_->CallJavascriptFunction(L"AccountsOptions.addUsers", whitelist_users); } } // namespace chromeos diff --git a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc index 1b5e119..b01ccea 100644 --- a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -72,7 +72,7 @@ void CoreChromeOSOptionsHandler::Observe(NotificationType type, void CoreChromeOSOptionsHandler::NotifySettingsChanged( const std::string* setting_name) { - DCHECK(dom_ui_); + DCHECK(web_ui_); DCHECK(CrosSettings::Get()->IsCrosSettings(*setting_name)); Value* value = NULL; if (!CrosSettings::Get()->Get(*setting_name, &value)) { @@ -88,7 +88,7 @@ void CoreChromeOSOptionsHandler::NotifySettingsChanged( ListValue result_value; result_value.Append(Value::CreateStringValue(setting_name->c_str())); result_value.Append(value->DeepCopy()); - dom_ui_->CallJavascriptFunction(callback_function, result_value); + web_ui_->CallJavascriptFunction(callback_function, result_value); } if (value) delete value; diff --git a/chrome/browser/chromeos/dom_ui/cros_language_options_handler.cc b/chrome/browser/chromeos/dom_ui/cros_language_options_handler.cc index cba094a..9d6f70b 100644 --- a/chrome/browser/chromeos/dom_ui/cros_language_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/cros_language_options_handler.cc @@ -70,16 +70,16 @@ void CrosLanguageOptionsHandler::GetLocalizedValues( void CrosLanguageOptionsHandler::RegisterMessages() { LanguageOptionsHandlerCommon::RegisterMessages(); - dom_ui_->RegisterMessageCallback("inputMethodDisable", + web_ui_->RegisterMessageCallback("inputMethodDisable", NewCallback(this, &CrosLanguageOptionsHandler::InputMethodDisableCallback)); - dom_ui_->RegisterMessageCallback("inputMethodEnable", + web_ui_->RegisterMessageCallback("inputMethodEnable", NewCallback(this, &CrosLanguageOptionsHandler::InputMethodEnableCallback)); - dom_ui_->RegisterMessageCallback("inputMethodOptionsOpen", + web_ui_->RegisterMessageCallback("inputMethodOptionsOpen", NewCallback(this, &CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback)); - dom_ui_->RegisterMessageCallback("uiLanguageRestart", + web_ui_->RegisterMessageCallback("uiLanguageRestart", NewCallback(this, &CrosLanguageOptionsHandler::RestartCallback)); } @@ -187,7 +187,7 @@ string16 CrosLanguageOptionsHandler::GetProductName() { void CrosLanguageOptionsHandler::SetApplicationLocale( std::string language_code) { - dom_ui_->GetProfile()->ChangeAppLocale( + web_ui_->GetProfile()->ChangeAppLocale( language_code, Profile::APP_LOCALE_CHANGED_VIA_SETTINGS); } @@ -195,7 +195,7 @@ void CrosLanguageOptionsHandler::RestartCallback(const ListValue* args) { UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_SignOut")); Browser* browser = Browser::GetBrowserForController( - &dom_ui_->tab_contents()->controller(), NULL); + &web_ui_->tab_contents()->controller(), NULL); if (browser) browser->ExecuteCommand(IDC_EXIT); } diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index f988dd5..9887eda 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc @@ -206,13 +206,13 @@ WebUIMessageHandler* ImageBurnHandler::Attach(WebUI* web_ui) { } void ImageBurnHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getRoots", + web_ui_->RegisterMessageCallback("getRoots", NewCallback(this, &ImageBurnHandler::HandleGetRoots)); - dom_ui_->RegisterMessageCallback("downloadImage", + web_ui_->RegisterMessageCallback("downloadImage", NewCallback(this, &ImageBurnHandler::HandleDownloadImage)); - dom_ui_->RegisterMessageCallback("burnImage", + web_ui_->RegisterMessageCallback("burnImage", NewCallback(this, &ImageBurnHandler::HandleBurnImage)); - dom_ui_->RegisterMessageCallback("cancelBurnImage", + web_ui_->RegisterMessageCallback("cancelBurnImage", NewCallback(this, &ImageBurnHandler::HandleCancelBurnImage)); } @@ -222,7 +222,7 @@ void ImageBurnHandler::MountChanged(chromeos::MountLibrary* obj, if ((evt == chromeos::DISK_REMOVED || evt == chromeos::DISK_CHANGED || evt == chromeos::DEVICE_REMOVED)) { - dom_ui_->CallJavascriptFunction(L"rootsChanged"); + web_ui_->CallJavascriptFunction(L"rootsChanged"); } } @@ -247,7 +247,7 @@ void ImageBurnHandler::OnDownloadUpdated(DownloadItem* download) { && download->state() != DownloadItem::COMPLETE) { scoped_ptr<DictionaryValue> result_value( download_util::CreateDownloadItemValue(download, 0)); - dom_ui_->CallJavascriptFunction(L"downloadUpdated", *result_value); + web_ui_->CallJavascriptFunction(L"downloadUpdated", *result_value); } if (download->state() == DownloadItem::CANCELLED) DownloadCompleted(false); @@ -306,7 +306,7 @@ void ImageBurnHandler::HandleGetRoots(const ListValue* args) { } info_value.SetString("functionCall", "getRoots"); info_value.SetString(std::string(kPropertyPath), ""); - dom_ui_->CallJavascriptFunction(L"browseFileResult", + web_ui_->CallJavascriptFunction(L"browseFileResult", info_value, results_value); } @@ -339,12 +339,12 @@ void ImageBurnHandler::DownloadCompleted(bool is_successful) { DictionaryValue signal_value; if (is_successful) { signal_value.SetString("state", "COMPLETE"); - dom_ui_->CallJavascriptFunction(L"downloadUpdated", signal_value); - dom_ui_->CallJavascriptFunction(L"promtUserDownloadFinished"); + web_ui_->CallJavascriptFunction(L"downloadUpdated", signal_value); + web_ui_->CallJavascriptFunction(L"promtUserDownloadFinished"); } else { signal_value.SetString("state", "CANCELLED"); - dom_ui_->CallJavascriptFunction(L"downloadUpdated", signal_value); - dom_ui_->CallJavascriptFunction(L"alertUserDownloadAborted"); + web_ui_->CallJavascriptFunction(L"downloadUpdated", signal_value); + web_ui_->CallJavascriptFunction(L"alertUserDownloadAborted"); } } @@ -357,13 +357,13 @@ void ImageBurnHandler::BurnImage() { signal_value.SetString("path", image_target_.value()); signal_value.SetInteger("received", 0); signal_value.SetString("progress_status_text", ""); - dom_ui_->CallJavascriptFunction(L"burnProgressUpdated", signal_value); + web_ui_->CallJavascriptFunction(L"burnProgressUpdated", signal_value); } } void ImageBurnHandler::FinalizeBurn(bool successful) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - dom_ui_->CallJavascriptFunction(successful ? + web_ui_->CallJavascriptFunction(successful ? L"burnSuccessful" : L"burnUnsuccessful"); } @@ -384,7 +384,7 @@ void ImageBurnHandler::UpdateBurnProgress(int64 total_burnt, progress_value.SetInteger("total", image_size); progress_value.SetString("path", path); - dom_ui_->CallJavascriptFunction(L"burnProgressUpdated", progress_value); + web_ui_->CallJavascriptFunction(L"burnProgressUpdated", progress_value); } string16 ImageBurnHandler::GetBurnProgressText(int64 total_burnt, diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index 716475b..ac460b3 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -309,30 +309,30 @@ void InternetOptionsHandler::GetLocalizedValues( void InternetOptionsHandler::RegisterMessages() { // Setup handlers specific to this panel. - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("buttonClickCallback", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("buttonClickCallback", NewCallback(this, &InternetOptionsHandler::ButtonClickCallback)); - dom_ui_->RegisterMessageCallback("refreshCellularPlan", + web_ui_->RegisterMessageCallback("refreshCellularPlan", NewCallback(this, &InternetOptionsHandler::RefreshCellularPlanCallback)); - dom_ui_->RegisterMessageCallback("loginToNetwork", + web_ui_->RegisterMessageCallback("loginToNetwork", NewCallback(this, &InternetOptionsHandler::LoginCallback)); - dom_ui_->RegisterMessageCallback("loginToCertNetwork", + web_ui_->RegisterMessageCallback("loginToCertNetwork", NewCallback(this, &InternetOptionsHandler::LoginCertCallback)); - dom_ui_->RegisterMessageCallback("loginToOtherNetwork", + web_ui_->RegisterMessageCallback("loginToOtherNetwork", NewCallback(this, &InternetOptionsHandler::LoginToOtherCallback)); - dom_ui_->RegisterMessageCallback("setDetails", + web_ui_->RegisterMessageCallback("setDetails", NewCallback(this, &InternetOptionsHandler::SetDetailsCallback)); - dom_ui_->RegisterMessageCallback("enableWifi", + web_ui_->RegisterMessageCallback("enableWifi", NewCallback(this, &InternetOptionsHandler::EnableWifiCallback)); - dom_ui_->RegisterMessageCallback("disableWifi", + web_ui_->RegisterMessageCallback("disableWifi", NewCallback(this, &InternetOptionsHandler::DisableWifiCallback)); - dom_ui_->RegisterMessageCallback("enableCellular", + web_ui_->RegisterMessageCallback("enableCellular", NewCallback(this, &InternetOptionsHandler::EnableCellularCallback)); - dom_ui_->RegisterMessageCallback("disableCellular", + web_ui_->RegisterMessageCallback("disableCellular", NewCallback(this, &InternetOptionsHandler::DisableCellularCallback)); - dom_ui_->RegisterMessageCallback("buyDataPlan", + web_ui_->RegisterMessageCallback("buyDataPlan", NewCallback(this, &InternetOptionsHandler::BuyDataPlanCallback)); - dom_ui_->RegisterMessageCallback("showMorePlanInfo", + web_ui_->RegisterMessageCallback("showMorePlanInfo", NewCallback(this, &InternetOptionsHandler::BuyDataPlanCallback)); } @@ -361,10 +361,10 @@ void InternetOptionsHandler::DisableCellularCallback(const ListValue* args) { } void InternetOptionsHandler::BuyDataPlanCallback(const ListValue* args) { - if (!dom_ui_) + if (!web_ui_) return; Browser* browser = BrowserList::FindBrowserWithFeature( - dom_ui_->GetProfile(), Browser::FEATURE_TABSTRIP); + web_ui_->GetProfile(), Browser::FEATURE_TABSTRIP); if (browser) browser->OpenMobilePlanTabAndActivate(); } @@ -373,13 +373,13 @@ void InternetOptionsHandler::RefreshNetworkData( chromeos::NetworkLibrary* cros) { DictionaryValue dictionary; FillNetworkInfo(&dictionary, cros); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.InternetOptions.refreshNetworkData", dictionary); } void InternetOptionsHandler::OnNetworkManagerChanged( chromeos::NetworkLibrary* cros) { - if (!dom_ui_) + if (!web_ui_) return; MonitorActiveNetwork(cros); RefreshNetworkData(cros); @@ -388,7 +388,7 @@ void InternetOptionsHandler::OnNetworkManagerChanged( void InternetOptionsHandler::OnNetworkChanged( chromeos::NetworkLibrary* cros, const chromeos::Network* network) { - if (dom_ui_) + if (web_ui_) RefreshNetworkData(cros); } @@ -414,7 +414,7 @@ void InternetOptionsHandler::MonitorActiveNetwork( void InternetOptionsHandler::OnCellularDataPlanChanged( chromeos::NetworkLibrary* obj) { - if (!dom_ui_) + if (!web_ui_) return; const chromeos::CellularNetwork* cellular = obj->cellular_network(); if (!cellular) @@ -432,7 +432,7 @@ void InternetOptionsHandler::OnCellularDataPlanChanged( connection_plans.SetBoolean("activated", cellular->activation_state() == chromeos::ACTIVATION_STATE_ACTIVATED); connection_plans.Set("plans", plan_list); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.InternetOptions.updateCellularPlans", connection_plans); } @@ -568,7 +568,7 @@ void InternetOptionsHandler::PopulateDictionaryDetails( } } - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.InternetOptions.showDetailedInfo", dictionary); } @@ -725,7 +725,7 @@ void InternetOptionsHandler::CreateModalPopup(views::WindowDelegate* view) { // TODO(beng): This is an improper direct dependency on Browser. Route this // through some sort of delegate. - Browser* browser = BrowserList::FindBrowserWithProfile(dom_ui_->GetProfile()); + Browser* browser = BrowserList::FindBrowserWithProfile(web_ui_->GetProfile()); views::Window* window = browser::CreateViewsWindow( browser->window()->GetNativeHandle(), gfx::Rect(), view); window->SetIsAlwaysOnTop(true); @@ -784,7 +784,7 @@ void InternetOptionsHandler::HandleWifiButtonClick( } else { DictionaryValue dictionary; dictionary.SetString("servicePath", network->service_path()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.InternetOptions.showPasswordEntry", dictionary); } } else { diff --git a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc index abf3759..2ceb0ff 100644 --- a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc +++ b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc @@ -267,8 +267,8 @@ WebUIMessageHandler* KeyboardOverlayHandler::Attach(WebUI* web_ui) { } void KeyboardOverlayHandler::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("getKeyboardOverlayId", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("getKeyboardOverlayId", NewCallback(this, &KeyboardOverlayHandler::GetKeyboardOverlayId)); } @@ -280,7 +280,7 @@ void KeyboardOverlayHandler::GetKeyboardOverlayId(const ListValue* args) { const std::string keyboard_overlay_id = library->GetKeyboardOverlayId(descriptor.id); StringValue param(keyboard_overlay_id); - dom_ui_->CallJavascriptFunction(L"initKeyboardOverlayId", param); + web_ui_->CallJavascriptFunction(L"initKeyboardOverlayId", param); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/chromeos/dom_ui/login/login_ui.cc b/chrome/browser/chromeos/dom_ui/login/login_ui.cc index ff9a314..18bca25 100644 --- a/chrome/browser/chromeos/dom_ui/login/login_ui.cc +++ b/chrome/browser/chromeos/dom_ui/login/login_ui.cc @@ -67,15 +67,15 @@ WebUIMessageHandler* LoginUIHandler::Attach(WebUI* web_ui) { } void LoginUIHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "LaunchIncognito", NewCallback(this, &LoginUIHandler::HandleLaunchIncognito)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "AuthenticateUser", NewCallback(this, &LoginUIHandler::HandleAuthenticateUser)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "ShutdownSystem", NewCallback(this, &LoginUIHandler::HandleShutdownSystem)); diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc index 6cbee12..5a1941b 100644 --- a/chrome/browser/chromeos/dom_ui/menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc @@ -357,35 +357,35 @@ WebUIMessageHandler* MenuHandler::Attach(WebUI* web_ui) { } void MenuHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "activate", NewCallback(this, &MenuHandler::HandleActivate)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "open_submenu", NewCallback(this, &MenuHandler::HandleOpenSubmenu)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "close_submenu", NewCallback(this, &MenuHandler::HandleCloseSubmenu)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "move_to_submenu", NewCallback(this, &MenuHandler::HandleMoveInputToSubmenu)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "move_to_parent", NewCallback(this, &MenuHandler::HandleMoveInputToParent)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "close_all", NewCallback(this, &MenuHandler::HandleCloseAll)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "model_updated", NewCallback(this, &MenuHandler::HandleModelUpdated)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "log", NewCallback(this, &MenuHandler::HandleLog)); @@ -466,7 +466,7 @@ void MenuHandler::HandleCloseAll(const ListValue* values) { void MenuHandler::HandleModelUpdated(const ListValue* values) { ui::MenuModel* model = GetMenuModel(); if (model) - static_cast<chromeos::MenuUI*>(dom_ui_)->ModelUpdated(model); + static_cast<chromeos::MenuUI*>(web_ui_)->ModelUpdated(model); } void MenuHandler::HandleLog(const ListValue* values) { @@ -507,7 +507,7 @@ namespace chromeos { chromeos::WebUIMenuControl* MenuHandlerBase::GetMenuControl() { WebUIMenuWidget* widget = chromeos::WebUIMenuWidget::FindWebUIMenuWidget( - dom_ui_->tab_contents()->GetNativeView()); + web_ui_->tab_contents()->GetNativeView()); if (widget) return widget->webui_menu(); // NativeMenuWebUI implements WebUIMenuControl else diff --git a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc index 5d422e9..84fc218 100644 --- a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc +++ b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc @@ -478,9 +478,9 @@ void MobileSetupHandler::Init(TabContents* contents) { } void MobileSetupHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback(kJsApiStartActivation, + web_ui_->RegisterMessageCallback(kJsApiStartActivation, NewCallback(this, &MobileSetupHandler::HandleStartActivation)); - dom_ui_->RegisterMessageCallback(kJsApiSetTransactionStatus, + web_ui_->RegisterMessageCallback(kJsApiSetTransactionStatus, NewCallback(this, &MobileSetupHandler::HandleSetTransactionStatus)); } @@ -711,7 +711,7 @@ bool MobileSetupHandler::ConnectionTimeout() { void MobileSetupHandler::EvaluateCellularNetwork( chromeos::CellularNetwork* network) { - if (!dom_ui_) + if (!web_ui_) return; PlanActivationState new_state = state_; @@ -1060,7 +1060,7 @@ void MobileSetupHandler::UpdatePage(chromeos::CellularNetwork* network, device_dict.SetInteger("state", state_); if (error_description.length()) device_dict.SetString("error", error_description); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( kJsDeviceStatusChangedHandler, device_dict); } @@ -1170,7 +1170,7 @@ void MobileSetupHandler::ReEnableOtherConnections() { lib->EnableWifiNetworkDevice(true); } - PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + PrefService* prefs = web_ui_->GetProfile()->GetPrefs(); if (reenable_cert_check_) { prefs->SetBoolean(prefs::kCertRevocationCheckingEnabled, true); @@ -1185,7 +1185,7 @@ void MobileSetupHandler::SetupActivationProcess( // Disable SSL cert checks since we will be doing this in // restricted pool. - PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + PrefService* prefs = web_ui_->GetProfile()->GetPrefs(); if (!reenable_cert_check_ && prefs->GetBoolean( prefs::kCertRevocationCheckingEnabled)) { diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc index 8e0defd..a50b151 100644 --- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc @@ -64,7 +64,7 @@ class NetworkMenuHandler : public chromeos::MenuHandlerBase, }; void NetworkMenuHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "action", NewCallback(this, &NetworkMenuHandler::HandleAction)); @@ -74,12 +74,12 @@ void NetworkMenuHandler::HandleAction(const ListValue* values) { ui::MenuModel* model = GetMenuModel(); if (model) { chromeos::NetworkMenuUI* network_menu_ui = - static_cast<chromeos::NetworkMenuUI*>(dom_ui_); + static_cast<chromeos::NetworkMenuUI*>(web_ui_); bool close_menu = network_menu_ui->ModelAction(model, values); if (close_menu) { chromeos::WebUIMenuWidget* widget = chromeos::WebUIMenuWidget::FindWebUIMenuWidget( - dom_ui_->tab_contents()->GetNativeView()); + web_ui_->tab_contents()->GetNativeView()); if (widget) { chromeos::NativeMenuWebUI* webui_menu = widget->webui_menu(); if (webui_menu) diff --git a/chrome/browser/chromeos/dom_ui/register_page_ui.cc b/chrome/browser/chromeos/dom_ui/register_page_ui.cc index bd61126..4e4323f 100644 --- a/chrome/browser/chromeos/dom_ui/register_page_ui.cc +++ b/chrome/browser/chromeos/dom_ui/register_page_ui.cc @@ -210,9 +210,9 @@ void RegisterPageHandler::Init() { void RegisterPageHandler::RegisterMessages() { #if defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback(kJsCallbackGetRegistrationUrl, + web_ui_->RegisterMessageCallback(kJsCallbackGetRegistrationUrl, NewCallback(this, &RegisterPageHandler::HandleGetRegistrationUrl)); - dom_ui_->RegisterMessageCallback(kJsCallbackUserInfo, + web_ui_->RegisterMessageCallback(kJsCallbackUserInfo, NewCallback(this, &RegisterPageHandler::HandleGetUserInfo)); #endif } @@ -230,7 +230,7 @@ void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) { return; } StringValue url_value(url); - dom_ui_->CallJavascriptFunction(kJsApiSetRegistrationUrl, url_value); + web_ui_->CallJavascriptFunction(kJsApiSetRegistrationUrl, url_value); } else { SkipRegistration("Startup manifest not defined."); } @@ -265,7 +265,7 @@ void RegisterPageHandler::SkipRegistration(const std::string& error_msg) { if (WizardController::default_controller()) WizardController::default_controller()->SkipRegistration(); else - dom_ui_->CallJavascriptFunction(kJsApiSkipRegistration); + web_ui_->CallJavascriptFunction(kJsApiSkipRegistration); #endif } @@ -307,7 +307,7 @@ void RegisterPageHandler::SendUserInfo() { value.SetString("user_first_name", ""); value.SetString("user_last_name", ""); - dom_ui_->CallJavascriptFunction(kJsApiSetUserInfo, value); + web_ui_->CallJavascriptFunction(kJsApiSetUserInfo, value); #endif } diff --git a/chrome/browser/chromeos/dom_ui/stats_options_handler.cc b/chrome/browser/chromeos/dom_ui/stats_options_handler.cc index fa0c65b..7beb18d 100644 --- a/chrome/browser/chromeos/dom_ui/stats_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/stats_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -29,7 +29,7 @@ void StatsOptionsHandler::Initialize() { // WebUIMessageHandler implementation. void StatsOptionsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "metricsReportingCheckboxAction", NewCallback(this, &StatsOptionsHandler::HandleMetricsReportingCheckbox)); } @@ -57,7 +57,7 @@ void StatsOptionsHandler::SetupMetricsReportingCheckbox(bool user_changed) { FundamentalValue checked(MetricsCrosSettingsProvider::GetMetricsStatus()); FundamentalValue disabled(!UserManager::Get()->current_user_is_owner()); FundamentalValue user_has_changed(user_changed); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetMetricsReportingCheckboxState", checked, disabled, user_has_changed); #endif diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc index fd6bfc8..f258959 100644 --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc @@ -76,17 +76,17 @@ void SystemOptionsHandler::GetLocalizedValues( } void SystemOptionsHandler::Initialize() { - DCHECK(dom_ui_); + DCHECK(web_ui_); PrefService* pref_service = g_browser_process->local_state(); bool acc_enabled = pref_service->GetBoolean(prefs::kAccessibilityEnabled); FundamentalValue checked(acc_enabled); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.SystemOptions.SetAccessibilityCheckboxState", checked); } void SystemOptionsHandler::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("accessibilityChange", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("accessibilityChange", NewCallback(this, &SystemOptionsHandler::AccessibilityChangeCallback)); } |