diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 19:28:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-14 19:28:23 +0000 |
| commit | 7b74898dbbdc1e9aaf9af9fe4a181f41bf867e7c (patch) | |
| tree | f1af7379426f7904d188cf61adb6d3222b59271e | |
| parent | 605482f0a49e9d779bb3239b7363d5ebccba3b69 (diff) | |
| download | chromium_src-7b74898dbbdc1e9aaf9af9fe4a181f41bf867e7c.zip chromium_src-7b74898dbbdc1e9aaf9af9fe4a181f41bf867e7c.tar.gz chromium_src-7b74898dbbdc1e9aaf9af9fe4a181f41bf867e7c.tar.bz2 | |
WebUI: Rename dom_ui_ variable to web_ui_.
BUG=59945
TEST=trybots
Review URL: http://codereview.chromium.org/6519012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74839 0039d316-1c4b-4281-b951-d872f2087c98
64 files changed, 652 insertions, 652 deletions
diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc index a3ab3d8..bb03c8f 100644 --- a/chrome/browser/browser_signin.cc +++ b/chrome/browser/browser_signin.cc @@ -145,9 +145,9 @@ BrowserSigninHtml::BrowserSigninHtml(BrowserSignin* signin, } void BrowserSigninHtml::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "SubmitAuth", NewCallback(this, &BrowserSigninHtml::HandleSubmitAuth)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "SigninInit", NewCallback(this, &BrowserSigninHtml::HandleSigninInit)); } @@ -156,19 +156,19 @@ void BrowserSigninHtml::ReloadUI() { } void BrowserSigninHtml::ForceDialogClose() { - if (!closed_ && dom_ui_) { + if (!closed_ && web_ui_) { StringValue value("DialogClose"); ListValue close_args; close_args.Append(new StringValue("")); - dom_ui_->CallJavascriptFunction(L"chrome.send", value, close_args); + web_ui_->CallJavascriptFunction(L"chrome.send", value, close_args); } } void BrowserSigninHtml::HandleSigninInit(const ListValue* args) { - if (!dom_ui_) + if (!web_ui_) return; - RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); + RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host(); rvh->ExecuteJavascriptInWebFrame(ASCIIToUTF16("//iframe[@id='login']"), ASCIIToUTF16("hideBlurb();")); 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)); } diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc index b72d700..e7cc713 100644 --- a/chrome/browser/dom_ui/app_launcher_handler.cc +++ b/chrome/browser/dom_ui/app_launcher_handler.cc @@ -144,19 +144,19 @@ WebUIMessageHandler* AppLauncherHandler::Attach(WebUI* web_ui) { } void AppLauncherHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getApps", + web_ui_->RegisterMessageCallback("getApps", NewCallback(this, &AppLauncherHandler::HandleGetApps)); - dom_ui_->RegisterMessageCallback("launchApp", + web_ui_->RegisterMessageCallback("launchApp", NewCallback(this, &AppLauncherHandler::HandleLaunchApp)); - dom_ui_->RegisterMessageCallback("setLaunchType", + web_ui_->RegisterMessageCallback("setLaunchType", NewCallback(this, &AppLauncherHandler::HandleSetLaunchType)); - dom_ui_->RegisterMessageCallback("uninstallApp", + web_ui_->RegisterMessageCallback("uninstallApp", NewCallback(this, &AppLauncherHandler::HandleUninstallApp)); - dom_ui_->RegisterMessageCallback("hideAppsPromo", + web_ui_->RegisterMessageCallback("hideAppsPromo", NewCallback(this, &AppLauncherHandler::HandleHideAppsPromo)); - dom_ui_->RegisterMessageCallback("createAppShortcut", + web_ui_->RegisterMessageCallback("createAppShortcut", NewCallback(this, &AppLauncherHandler::HandleCreateAppShortcut)); - dom_ui_->RegisterMessageCallback("reorderApps", + web_ui_->RegisterMessageCallback("reorderApps", NewCallback(this, &AppLauncherHandler::HandleReorderApps)); } @@ -170,16 +170,16 @@ void AppLauncherHandler::Observe(NotificationType type, case NotificationType::EXTENSION_LOADED: case NotificationType::EXTENSION_UNLOADED: case NotificationType::EXTENSION_LAUNCHER_REORDERED: - if (dom_ui_->tab_contents()) + if (web_ui_->tab_contents()) HandleGetApps(NULL); break; case NotificationType::PREF_CHANGED: { - if (!dom_ui_->tab_contents()) + if (!web_ui_->tab_contents()) break; DictionaryValue dictionary; FillAppDictionary(&dictionary); - dom_ui_->CallJavascriptFunction(L"appsPrefChangeCallback", dictionary); + web_ui_->CallJavascriptFunction(L"appsPrefChangeCallback", dictionary); break; } default: @@ -242,7 +242,7 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) { ignore_changes_ = true; UninstallDefaultApps(); ignore_changes_ = false; - ShownSectionsHandler::SetShownSection(dom_ui_->GetProfile()->GetPrefs(), + ShownSectionsHandler::SetShownSection(web_ui_->GetProfile()->GetPrefs(), THUMB); } dictionary.SetBoolean("showPromo", false); @@ -250,7 +250,7 @@ void AppLauncherHandler::HandleGetApps(const ListValue* args) { } FillAppDictionary(&dictionary); - dom_ui_->CallJavascriptFunction(L"getAppsCallback", dictionary); + web_ui_->CallJavascriptFunction(L"getAppsCallback", dictionary); // First time we get here we set up the observer so that we can tell update // the apps as they change. @@ -289,7 +289,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) { // Offset the rect by the tab contents bounds. gfx::Rect rect(left, top, width, height); gfx::Rect tab_contents_bounds; - dom_ui_->tab_contents()->GetContainerBounds(&tab_contents_bounds); + web_ui_->tab_contents()->GetContainerBounds(&tab_contents_bounds); rect.Offset(tab_contents_bounds.origin()); const Extension* extension = @@ -362,7 +362,7 @@ void AppLauncherHandler::HandleHideAppsPromo(const ListValue* args) { extension_misc::PROMO_CLOSE, extension_misc::PROMO_BUCKET_BOUNDARY); - ShownSectionsHandler::SetShownSection(dom_ui_->GetProfile()->GetPrefs(), + ShownSectionsHandler::SetShownSection(web_ui_->GetProfile()->GetPrefs(), THUMB); ignore_changes_ = true; UninstallDefaultApps(); @@ -442,7 +442,7 @@ void AppLauncherHandler::InstallUIAbort() { ExtensionInstallUI* AppLauncherHandler::GetExtensionInstallUI() { if (!install_ui_.get()) - install_ui_.reset(new ExtensionInstallUI(dom_ui_->GetProfile())); + install_ui_.reset(new ExtensionInstallUI(web_ui_->GetProfile())); return install_ui_.get(); } diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index 3295ee7..8423877 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -519,19 +519,19 @@ base::StringPiece BugReportHandler::Init() { } void BugReportHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getDialogDefaults", + web_ui_->RegisterMessageCallback("getDialogDefaults", NewCallback(this, &BugReportHandler::HandleGetDialogDefaults)); - dom_ui_->RegisterMessageCallback("refreshCurrentScreenshot", + web_ui_->RegisterMessageCallback("refreshCurrentScreenshot", NewCallback(this, &BugReportHandler::HandleRefreshCurrentScreenshot)); #if defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback("refreshSavedScreenshots", + web_ui_->RegisterMessageCallback("refreshSavedScreenshots", NewCallback(this, &BugReportHandler::HandleRefreshSavedScreenshots)); #endif - dom_ui_->RegisterMessageCallback("sendReport", + web_ui_->RegisterMessageCallback("sendReport", NewCallback(this, &BugReportHandler::HandleSendReport)); - dom_ui_->RegisterMessageCallback("cancel", + web_ui_->RegisterMessageCallback("cancel", NewCallback(this, &BugReportHandler::HandleCancel)); - dom_ui_->RegisterMessageCallback("openSystemTab", + web_ui_->RegisterMessageCallback("openSystemTab", NewCallback(this, &BugReportHandler::HandleOpenSystemTab)); } @@ -562,13 +562,13 @@ void BugReportHandler::HandleGetDialogDefaults(const ListValue*) { dialog_defaults.Append(new StringValue(GetUserEmail())); #endif - dom_ui_->CallJavascriptFunction(L"setupDialogDefaults", dialog_defaults); + web_ui_->CallJavascriptFunction(L"setupDialogDefaults", dialog_defaults); } void BugReportHandler::HandleRefreshCurrentScreenshot(const ListValue*) { std::string current_screenshot(kCurrentScreenshotUrl); StringValue screenshot(current_screenshot); - dom_ui_->CallJavascriptFunction(L"setupCurrentScreenshot", screenshot); + web_ui_->CallJavascriptFunction(L"setupCurrentScreenshot", screenshot); } @@ -580,7 +580,7 @@ void BugReportHandler::HandleRefreshSavedScreenshots(const ListValue*) { ListValue screenshots_list; for (size_t i = 0; i < saved_screenshots.size(); ++i) screenshots_list.Append(new StringValue(saved_screenshots[i])); - dom_ui_->CallJavascriptFunction(L"setupSavedScreenshots", screenshots_list); + web_ui_->CallJavascriptFunction(L"setupSavedScreenshots", screenshots_list); } #endif @@ -662,7 +662,7 @@ void BugReportHandler::HandleSendReport(const ListValue* list_value) { #endif // Update the data in bug_report_ so it can be sent - bug_report_->UpdateData(dom_ui_->GetProfile() + bug_report_->UpdateData(web_ui_->GetProfile() , target_tab_url_ , problem_type , page_url diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index daa5e2d..455b446 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.cc @@ -135,7 +135,7 @@ class ConflictsDOMHandler : public WebUIMessageHandler, }; void ConflictsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("requestModuleList", + web_ui_->RegisterMessageCallback("requestModuleList", NewCallback(this, &ConflictsDOMHandler::HandleRequestModuleList)); } @@ -169,7 +169,7 @@ void ConflictsDOMHandler::SendModuleList() { } results.SetString("modulesTableTitle", table_title); - dom_ui_->CallJavascriptFunction(L"returnModuleList", results); + web_ui_->CallJavascriptFunction(L"returnModuleList", results); } void ConflictsDOMHandler::Observe(NotificationType type, diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc index 82badc9..9f072b3 100644 --- a/chrome/browser/dom_ui/downloads_dom_handler.cc +++ b/chrome/browser/dom_ui/downloads_dom_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -68,29 +68,29 @@ void DownloadsDOMHandler::Init() { } void DownloadsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getDownloads", + web_ui_->RegisterMessageCallback("getDownloads", NewCallback(this, &DownloadsDOMHandler::HandleGetDownloads)); - dom_ui_->RegisterMessageCallback("openFile", + web_ui_->RegisterMessageCallback("openFile", NewCallback(this, &DownloadsDOMHandler::HandleOpenFile)); - dom_ui_->RegisterMessageCallback("drag", + web_ui_->RegisterMessageCallback("drag", NewCallback(this, &DownloadsDOMHandler::HandleDrag)); - dom_ui_->RegisterMessageCallback("saveDangerous", + web_ui_->RegisterMessageCallback("saveDangerous", NewCallback(this, &DownloadsDOMHandler::HandleSaveDangerous)); - dom_ui_->RegisterMessageCallback("discardDangerous", + web_ui_->RegisterMessageCallback("discardDangerous", NewCallback(this, &DownloadsDOMHandler::HandleDiscardDangerous)); - dom_ui_->RegisterMessageCallback("show", + web_ui_->RegisterMessageCallback("show", NewCallback(this, &DownloadsDOMHandler::HandleShow)); - dom_ui_->RegisterMessageCallback("togglepause", + web_ui_->RegisterMessageCallback("togglepause", NewCallback(this, &DownloadsDOMHandler::HandlePause)); - dom_ui_->RegisterMessageCallback("resume", + web_ui_->RegisterMessageCallback("resume", NewCallback(this, &DownloadsDOMHandler::HandlePause)); - dom_ui_->RegisterMessageCallback("remove", + web_ui_->RegisterMessageCallback("remove", NewCallback(this, &DownloadsDOMHandler::HandleRemove)); - dom_ui_->RegisterMessageCallback("cancel", + web_ui_->RegisterMessageCallback("cancel", NewCallback(this, &DownloadsDOMHandler::HandleCancel)); - dom_ui_->RegisterMessageCallback("clearAll", + web_ui_->RegisterMessageCallback("clearAll", NewCallback(this, &DownloadsDOMHandler::HandleClearAll)); } @@ -108,7 +108,7 @@ void DownloadsDOMHandler::OnDownloadUpdated(DownloadItem* download) { ListValue results_value; results_value.Append(download_util::CreateDownloadItemValue(download, id)); - dom_ui_->CallJavascriptFunction(L"downloadUpdated", results_value); + web_ui_->CallJavascriptFunction(L"downloadUpdated", results_value); } // A download has started or been deleted. Query our DownloadManager for the @@ -160,7 +160,7 @@ void DownloadsDOMHandler::HandleDrag(const ListValue* args) { IconManager* im = g_browser_process->icon_manager(); SkBitmap* icon = im->LookupIcon(file->GetUserVerifiedFilePath(), IconLoader::NORMAL); - gfx::NativeView view = dom_ui_->tab_contents()->GetNativeView(); + gfx::NativeView view = web_ui_->tab_contents()->GetNativeView(); download_util::DragDownload(file, icon, view); } } @@ -217,7 +217,7 @@ void DownloadsDOMHandler::SendCurrentDownloads() { results_value.Append(download_util::CreateDownloadItemValue(*it, index)); } - dom_ui_->CallJavascriptFunction(L"downloadsList", results_value); + web_ui_->CallJavascriptFunction(L"downloadsList", results_value); } void DownloadsDOMHandler::ClearDownloadItems() { diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc index 1c274b4..2b7ba40 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.cc +++ b/chrome/browser/dom_ui/filebrowse_ui.cc @@ -469,41 +469,41 @@ void FilebrowseHandler::Init() { } void FilebrowseHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getRoots", + web_ui_->RegisterMessageCallback("getRoots", NewCallback(this, &FilebrowseHandler::HandleGetRoots)); - dom_ui_->RegisterMessageCallback("getChildren", + web_ui_->RegisterMessageCallback("getChildren", NewCallback(this, &FilebrowseHandler::HandleGetChildren)); - dom_ui_->RegisterMessageCallback("getMetadata", + web_ui_->RegisterMessageCallback("getMetadata", NewCallback(this, &FilebrowseHandler::HandleGetMetadata)); - dom_ui_->RegisterMessageCallback("openNewPopupWindow", + web_ui_->RegisterMessageCallback("openNewPopupWindow", NewCallback(this, &FilebrowseHandler::OpenNewPopupWindow)); - dom_ui_->RegisterMessageCallback("openNewFullWindow", + web_ui_->RegisterMessageCallback("openNewFullWindow", NewCallback(this, &FilebrowseHandler::OpenNewFullWindow)); - dom_ui_->RegisterMessageCallback("uploadToPicasaweb", + web_ui_->RegisterMessageCallback("uploadToPicasaweb", NewCallback(this, &FilebrowseHandler::UploadToPicasaweb)); - dom_ui_->RegisterMessageCallback("getDownloads", + web_ui_->RegisterMessageCallback("getDownloads", NewCallback(this, &FilebrowseHandler::HandleGetDownloads)); - dom_ui_->RegisterMessageCallback("createNewFolder", + web_ui_->RegisterMessageCallback("createNewFolder", NewCallback(this, &FilebrowseHandler::HandleCreateNewFolder)); - dom_ui_->RegisterMessageCallback("playMediaFile", + web_ui_->RegisterMessageCallback("playMediaFile", NewCallback(this, &FilebrowseHandler::PlayMediaFile)); - dom_ui_->RegisterMessageCallback("enqueueMediaFile", + web_ui_->RegisterMessageCallback("enqueueMediaFile", NewCallback(this, &FilebrowseHandler::EnqueueMediaFile)); - dom_ui_->RegisterMessageCallback("pauseToggleDownload", + web_ui_->RegisterMessageCallback("pauseToggleDownload", NewCallback(this, &FilebrowseHandler::HandlePauseToggleDownload)); - dom_ui_->RegisterMessageCallback("deleteFile", + web_ui_->RegisterMessageCallback("deleteFile", NewCallback(this, &FilebrowseHandler::HandleDeleteFile)); - dom_ui_->RegisterMessageCallback("copyFile", + web_ui_->RegisterMessageCallback("copyFile", NewCallback(this, &FilebrowseHandler::HandleCopyFile)); - dom_ui_->RegisterMessageCallback("cancelDownload", + web_ui_->RegisterMessageCallback("cancelDownload", NewCallback(this, &FilebrowseHandler::HandleCancelDownload)); - dom_ui_->RegisterMessageCallback("allowDownload", + web_ui_->RegisterMessageCallback("allowDownload", NewCallback(this, &FilebrowseHandler::HandleAllowDownload)); - dom_ui_->RegisterMessageCallback("refreshDirectory", + web_ui_->RegisterMessageCallback("refreshDirectory", NewCallback(this, &FilebrowseHandler::HandleRefreshDirectory)); - dom_ui_->RegisterMessageCallback("isAdvancedEnabled", + web_ui_->RegisterMessageCallback("isAdvancedEnabled", NewCallback(this, &FilebrowseHandler::HandleIsAdvancedEnabled)); - dom_ui_->RegisterMessageCallback("validateSavePath", + web_ui_->RegisterMessageCallback("validateSavePath", NewCallback(this, &FilebrowseHandler::HandleValidateSavePath)); } @@ -545,7 +545,7 @@ void FilebrowseHandler::FireUploadComplete() { picture_url += kPicasawebDropBox; info_value.SetString("url", picture_url); info_value.SetInteger("status_code", upload_response_code_); - dom_ui_->CallJavascriptFunction(L"uploadComplete", info_value); + web_ui_->CallJavascriptFunction(L"uploadComplete", info_value); #endif } @@ -555,7 +555,7 @@ void FilebrowseHandler::MountChanged(chromeos::MountLibrary* obj, const std::string& path) { if (evt == chromeos::DISK_REMOVED || evt == chromeos::DISK_CHANGED) { - dom_ui_->CallJavascriptFunction(L"rootsChanged"); + web_ui_->CallJavascriptFunction(L"rootsChanged"); } } #endif @@ -620,7 +620,7 @@ void FilebrowseHandler::HandleGetRoots(const ListValue* args) { info_value.SetString("functionCall", "getRoots"); info_value.SetString(kPropertyPath, ""); - dom_ui_->CallJavascriptFunction(L"browseFileResult", + web_ui_->CallJavascriptFunction(L"browseFileResult", info_value, results_value); } @@ -676,7 +676,7 @@ void FilebrowseHandler::HandleIsAdvancedEnabled(const ListValue* args) { DictionaryValue info_value; info_value.SetBoolean("enabled", is_enabled); info_value.SetBoolean("mpEnabled", mp_enabled); - dom_ui_->CallJavascriptFunction(L"enabledResult", + web_ui_->CallJavascriptFunction(L"enabledResult", info_value); #endif @@ -929,7 +929,7 @@ void FilebrowseHandler::OnListDone(int error) { info_value.SetString("functionCall", "getChildren"); } info_value.SetString(kPropertyPath, currentpath_.value()); - dom_ui_->CallJavascriptFunction(L"browseFileResult", + web_ui_->CallJavascriptFunction(L"browseFileResult", info_value, *(filelist_value_.get())); } @@ -981,7 +981,7 @@ void FilebrowseHandler::UpdateDownloadList() { void FilebrowseHandler::SendNewDownload(DownloadItem* download) { ListValue results_value; results_value.Append(download_util::CreateDownloadItemValue(download, -1)); - dom_ui_->CallJavascriptFunction(L"newDownload", results_value); + web_ui_->CallJavascriptFunction(L"newDownload", results_value); } void FilebrowseHandler::DeleteFile(const FilePath& path, TaskProxy* task) { @@ -1129,7 +1129,7 @@ void FilebrowseHandler::FireOnValidatedSavePathOnUIThread(bool valid, FundamentalValue valid_value(valid); StringValue path_value(save_path.value()); - dom_ui_->CallJavascriptFunction(L"onValidatedSavePath", + web_ui_->CallJavascriptFunction(L"onValidatedSavePath", valid_value, path_value); } @@ -1143,7 +1143,7 @@ void FilebrowseHandler::OnDownloadUpdated(DownloadItem* download) { scoped_ptr<DictionaryValue> download_item( download_util::CreateDownloadItemValue(download, id)); - dom_ui_->CallJavascriptFunction(L"downloadUpdated", *download_item.get()); + web_ui_->CallJavascriptFunction(L"downloadUpdated", *download_item.get()); } void FilebrowseHandler::ClearDownloadItems() { @@ -1162,7 +1162,7 @@ void FilebrowseHandler::SendCurrentDownloads() { results_value.Append(download_util::CreateDownloadItemValue(*it, index)); } - dom_ui_->CallJavascriptFunction(L"downloadsList", results_value); + web_ui_->CallJavascriptFunction(L"downloadsList", results_value); } void FilebrowseHandler::OnDownloadFileCompleted(DownloadItem* download) { diff --git a/chrome/browser/dom_ui/flags_ui.cc b/chrome/browser/dom_ui/flags_ui.cc index 0184773..8b14361 100644 --- a/chrome/browser/dom_ui/flags_ui.cc +++ b/chrome/browser/dom_ui/flags_ui.cc @@ -125,11 +125,11 @@ class FlagsDOMHandler : public WebUIMessageHandler { }; void FlagsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("requestFlagsExperiments", + web_ui_->RegisterMessageCallback("requestFlagsExperiments", NewCallback(this, &FlagsDOMHandler::HandleRequestFlagsExperiments)); - dom_ui_->RegisterMessageCallback("enableFlagsExperiment", + web_ui_->RegisterMessageCallback("enableFlagsExperiment", NewCallback(this, &FlagsDOMHandler::HandleEnableFlagsExperimentMessage)); - dom_ui_->RegisterMessageCallback("restartBrowser", + web_ui_->RegisterMessageCallback("restartBrowser", NewCallback(this, &FlagsDOMHandler::HandleRestartBrowser)); } @@ -140,7 +140,7 @@ void FlagsDOMHandler::HandleRequestFlagsExperiments(const ListValue* args) { g_browser_process->local_state())); results.SetBoolean("needsRestart", about_flags::IsRestartNeededToCommitChanges()); - dom_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results); + web_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results); } void FlagsDOMHandler::HandleEnableFlagsExperimentMessage( diff --git a/chrome/browser/dom_ui/foreign_session_handler.cc b/chrome/browser/dom_ui/foreign_session_handler.cc index eaf378a..77b953a 100644 --- a/chrome/browser/dom_ui/foreign_session_handler.cc +++ b/chrome/browser/dom_ui/foreign_session_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. @@ -33,10 +33,10 @@ ForeignSessionHandler::ForeignSessionHandler() { } void ForeignSessionHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getForeignSessions", + web_ui_->RegisterMessageCallback("getForeignSessions", NewCallback(this, &ForeignSessionHandler::HandleGetForeignSessions)); - dom_ui_->RegisterMessageCallback("openForeignSession", + web_ui_->RegisterMessageCallback("openForeignSession", NewCallback(this, &ForeignSessionHandler::HandleOpenForeignSession)); } @@ -62,7 +62,7 @@ void ForeignSessionHandler::Observe(NotificationType type, case NotificationType::FOREIGN_SESSION_DISABLED: // Calling foreignSessions with empty list will automatically hide // foreign session section. - dom_ui_->CallJavascriptFunction(L"foreignSessions", list_value); + web_ui_->CallJavascriptFunction(L"foreignSessions", list_value); break; default: NOTREACHED(); @@ -70,7 +70,7 @@ void ForeignSessionHandler::Observe(NotificationType type, } SessionModelAssociator* ForeignSessionHandler::GetModelAssociator() { - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); if (service == NULL) return NULL; // We only want to set the model associator if there is one, and it is done @@ -81,7 +81,7 @@ SessionModelAssociator* ForeignSessionHandler::GetModelAssociator() { !service->ShouldPushChanges()) { return NULL; } - return dom_ui_->GetProfile()->GetProfileSyncService()-> + return web_ui_->GetProfile()->GetProfileSyncService()-> GetSessionModelAssociator(); } @@ -125,7 +125,7 @@ void ForeignSessionHandler::HandleGetForeignSessions(const ListValue* args) { // Give ownership to |session_list| session_list.Append(window_list.release()); } - dom_ui_->CallJavascriptFunction(L"foreignSessions", session_list); + web_ui_->CallJavascriptFunction(L"foreignSessions", session_list); } void ForeignSessionHandler::HandleOpenForeignSession( @@ -172,7 +172,7 @@ void ForeignSessionHandler::HandleOpenForeignSession( LOG(ERROR) << "Failed to load foreign tab."; return; } - SessionRestore::RestoreForeignSessionTab(dom_ui_->GetProfile(), *tab); + SessionRestore::RestoreForeignSessionTab(web_ui_->GetProfile(), *tab); } else { std::vector<SessionWindow*> windows; // Note: we don't own the ForeignSessions themselves. @@ -187,7 +187,7 @@ void ForeignSessionHandler::HandleOpenForeignSession( ((window_num == kInvalidId) ? std::vector<SessionWindow*>::const_iterator(windows.end()) : iter_begin+1); - SessionRestore::RestoreForeignSessionWindows(dom_ui_->GetProfile(), + SessionRestore::RestoreForeignSessionWindows(web_ui_->GetProfile(), iter_begin, iter_end); } diff --git a/chrome/browser/dom_ui/generic_handler.cc b/chrome/browser/dom_ui/generic_handler.cc index ec1d185..d6682cc 100644 --- a/chrome/browser/dom_ui/generic_handler.cc +++ b/chrome/browser/dom_ui/generic_handler.cc @@ -16,7 +16,7 @@ GenericHandler::~GenericHandler() { } void GenericHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("navigateToUrl", + web_ui_->RegisterMessageCallback("navigateToUrl", NewCallback(this, &GenericHandler::HandleNavigateToUrl)); } @@ -45,7 +45,7 @@ void GenericHandler::HandleNavigateToUrl(const ListValue* args) { disposition = alt_string == "true" ? SAVE_TO_DISK : CURRENT_TAB; } - dom_ui_->tab_contents()->OpenURL( + web_ui_->tab_contents()->OpenURL( GURL(url_string), GURL(), disposition, PageTransition::LINK); // This may delete us! diff --git a/chrome/browser/dom_ui/gpu_internals_ui.cc b/chrome/browser/dom_ui/gpu_internals_ui.cc index 7b399ce6..1dcc3d8 100644 --- a/chrome/browser/dom_ui/gpu_internals_ui.cc +++ b/chrome/browser/dom_ui/gpu_internals_ui.cc @@ -149,7 +149,7 @@ WebUIMessageHandler* GpuMessageHandler::Attach(WebUI* web_ui) { void GpuMessageHandler::RegisterMessages() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "callAsync", NewCallback(this, &GpuMessageHandler::OnCallAsync)); } @@ -193,12 +193,12 @@ void GpuMessageHandler::OnCallAsync(const ListValue* args) { // call BrowserBridge.onCallAsyncReply with result if (ret) { - dom_ui_->CallJavascriptFunction(L"browserBridge.onCallAsyncReply", + web_ui_->CallJavascriptFunction(L"browserBridge.onCallAsyncReply", *requestId, *ret); delete ret; } else { - dom_ui_->CallJavascriptFunction(L"browserBridge.onCallAsyncReply", + web_ui_->CallJavascriptFunction(L"browserBridge.onCallAsyncReply", *requestId); } } diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index 5c9c84d..ceb754f 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -140,13 +140,13 @@ WebUIMessageHandler* BrowsingHistoryHandler2::Attach(WebUI* web_ui) { } void BrowsingHistoryHandler2::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getHistory", + web_ui_->RegisterMessageCallback("getHistory", NewCallback(this, &BrowsingHistoryHandler2::HandleGetHistory)); - dom_ui_->RegisterMessageCallback("searchHistory", + web_ui_->RegisterMessageCallback("searchHistory", NewCallback(this, &BrowsingHistoryHandler2::HandleSearchHistory)); - dom_ui_->RegisterMessageCallback("removeURLsOnOneDay", + web_ui_->RegisterMessageCallback("removeURLsOnOneDay", NewCallback(this, &BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay)); - dom_ui_->RegisterMessageCallback("clearBrowsingData", + web_ui_->RegisterMessageCallback("clearBrowsingData", NewCallback(this, &BrowsingHistoryHandler2::HandleClearBrowsingData)); } @@ -169,7 +169,7 @@ void BrowsingHistoryHandler2::HandleGetHistory(const ListValue* args) { search_text_ = string16(); HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, &cancelable_search_consumer_, @@ -194,7 +194,7 @@ void BrowsingHistoryHandler2::HandleSearchHistory(const ListValue* args) { // Need to remember the query string for our results. search_text_ = query; HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, &cancelable_search_consumer_, @@ -203,7 +203,7 @@ void BrowsingHistoryHandler2::HandleSearchHistory(const ListValue* args) { void BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay(const ListValue* args) { if (cancelable_delete_consumer_.HasPendingRequests()) { - dom_ui_->CallJavascriptFunction(L"deleteFailed"); + web_ui_->CallJavascriptFunction(L"deleteFailed"); return; } @@ -231,7 +231,7 @@ void BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay(const ListValue* args) { } HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->ExpireHistoryBetween( urls, begin_time, end_time, &cancelable_delete_consumer_, NewCallback(this, &BrowsingHistoryHandler2::RemoveComplete)); @@ -240,7 +240,7 @@ void BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay(const ListValue* args) { void BrowsingHistoryHandler2::HandleClearBrowsingData(const ListValue* args) { // 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()); if (browser) browser->OpenClearBrowsingDataDialog(); } @@ -288,7 +288,7 @@ void BrowsingHistoryHandler2::QueryComplete( page_value->SetString("snippet", page.snippet().text()); } page_value->SetBoolean("starred", - dom_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url())); + web_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url())); results_value.Append(page_value); } @@ -296,12 +296,12 @@ void BrowsingHistoryHandler2::QueryComplete( info_value.SetString("term", search_text_); info_value.SetBoolean("finished", results->reached_beginning()); - dom_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value); + web_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value); } void BrowsingHistoryHandler2::RemoveComplete() { // Some Visits were deleted from history. Reload the list. - dom_ui_->CallJavascriptFunction(L"deleteComplete"); + web_ui_->CallJavascriptFunction(L"deleteComplete"); } void BrowsingHistoryHandler2::ExtractSearchHistoryArguments( @@ -382,7 +382,7 @@ void BrowsingHistoryHandler2::Observe(NotificationType type, } // Some URLs were deleted from history. Reload the list. - dom_ui_->CallJavascriptFunction(L"historyDeleted"); + web_ui_->CallJavascriptFunction(L"historyDeleted"); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 8e5e59e..680ada9 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -140,13 +140,13 @@ WebUIMessageHandler* BrowsingHistoryHandler::Attach(WebUI* web_ui) { } void BrowsingHistoryHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getHistory", + web_ui_->RegisterMessageCallback("getHistory", NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory)); - dom_ui_->RegisterMessageCallback("searchHistory", + web_ui_->RegisterMessageCallback("searchHistory", NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory)); - dom_ui_->RegisterMessageCallback("removeURLsOnOneDay", + web_ui_->RegisterMessageCallback("removeURLsOnOneDay", NewCallback(this, &BrowsingHistoryHandler::HandleRemoveURLsOnOneDay)); - dom_ui_->RegisterMessageCallback("clearBrowsingData", + web_ui_->RegisterMessageCallback("clearBrowsingData", NewCallback(this, &BrowsingHistoryHandler::HandleClearBrowsingData)); } @@ -169,7 +169,7 @@ void BrowsingHistoryHandler::HandleGetHistory(const ListValue* args) { search_text_ = string16(); HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, &cancelable_search_consumer_, @@ -194,7 +194,7 @@ void BrowsingHistoryHandler::HandleSearchHistory(const ListValue* args) { // Need to remember the query string for our results. search_text_ = query; HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, &cancelable_search_consumer_, @@ -203,7 +203,7 @@ void BrowsingHistoryHandler::HandleSearchHistory(const ListValue* args) { void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const ListValue* args) { if (cancelable_delete_consumer_.HasPendingRequests()) { - dom_ui_->CallJavascriptFunction(L"deleteFailed"); + web_ui_->CallJavascriptFunction(L"deleteFailed"); return; } @@ -231,7 +231,7 @@ void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const ListValue* args) { } HistoryService* hs = - dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); + web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->ExpireHistoryBetween( urls, begin_time, end_time, &cancelable_delete_consumer_, NewCallback(this, &BrowsingHistoryHandler::RemoveComplete)); @@ -240,7 +240,7 @@ void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const ListValue* args) { void BrowsingHistoryHandler::HandleClearBrowsingData(const ListValue* args) { // 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()); if (browser) browser->OpenClearBrowsingDataDialog(); } @@ -288,7 +288,7 @@ void BrowsingHistoryHandler::QueryComplete( page_value->SetString("snippet", page.snippet().text()); } page_value->SetBoolean("starred", - dom_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url())); + web_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url())); results_value.Append(page_value); } @@ -296,12 +296,12 @@ void BrowsingHistoryHandler::QueryComplete( info_value.SetString("term", search_text_); info_value.SetBoolean("finished", results->reached_beginning()); - dom_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value); + web_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value); } void BrowsingHistoryHandler::RemoveComplete() { // Some Visits were deleted from history. Reload the list. - dom_ui_->CallJavascriptFunction(L"deleteComplete"); + web_ui_->CallJavascriptFunction(L"deleteComplete"); } void BrowsingHistoryHandler::ExtractSearchHistoryArguments( @@ -370,7 +370,7 @@ void BrowsingHistoryHandler::Observe(NotificationType type, } // Some URLs were deleted from history. Reload the list. - dom_ui_->CallJavascriptFunction(L"historyDeleted"); + web_ui_->CallJavascriptFunction(L"historyDeleted"); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index ace6006..23fc229 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -226,19 +226,19 @@ void MediaplayerHandler::Init(bool is_playlist, TabContents* contents) { } void MediaplayerHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("currentOffsetChanged", + web_ui_->RegisterMessageCallback("currentOffsetChanged", NewCallback(this, &MediaplayerHandler::HandleCurrentOffsetChanged)); - dom_ui_->RegisterMessageCallback("playbackError", + web_ui_->RegisterMessageCallback("playbackError", NewCallback(this, &MediaplayerHandler::HandlePlaybackError)); - dom_ui_->RegisterMessageCallback("getCurrentPlaylist", + web_ui_->RegisterMessageCallback("getCurrentPlaylist", NewCallback(this, &MediaplayerHandler::HandleGetCurrentPlaylist)); - dom_ui_->RegisterMessageCallback("togglePlaylist", + web_ui_->RegisterMessageCallback("togglePlaylist", NewCallback(this, &MediaplayerHandler::HandleTogglePlaylist)); - dom_ui_->RegisterMessageCallback("setCurrentPlaylistOffset", + web_ui_->RegisterMessageCallback("setCurrentPlaylistOffset", NewCallback(this, &MediaplayerHandler::HandleSetCurrentPlaylistOffset)); - dom_ui_->RegisterMessageCallback("toggleFullscreen", + web_ui_->RegisterMessageCallback("toggleFullscreen", NewCallback(this, &MediaplayerHandler::HandleToggleFullscreen)); - dom_ui_->RegisterMessageCallback("showPlaylist", + web_ui_->RegisterMessageCallback("showPlaylist", NewCallback(this, &MediaplayerHandler::HandleShowPlaylist)); } @@ -285,7 +285,7 @@ void MediaplayerHandler::FirePlaylistChanged(const std::string& path, info_value.SetString(kPropertyPath, path); info_value.SetBoolean(kPropertyForce, force); info_value.SetInteger(kPropertyOffset, offset); - dom_ui_->CallJavascriptFunction(L"playlistChanged", info_value, urls); + web_ui_->CallJavascriptFunction(L"playlistChanged", info_value, urls); } void MediaplayerHandler::SetCurrentPlaylistOffset(int offset) { diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc index 93aa53b9..6c762f4 100644 --- a/chrome/browser/dom_ui/most_visited_handler.cc +++ b/chrome/browser/dom_ui/most_visited_handler.cc @@ -91,21 +91,21 @@ WebUIMessageHandler* MostVisitedHandler::Attach(WebUI* web_ui) { void MostVisitedHandler::RegisterMessages() { // Register ourselves as the handler for the "mostvisited" message from // Javascript. - dom_ui_->RegisterMessageCallback("getMostVisited", + web_ui_->RegisterMessageCallback("getMostVisited", NewCallback(this, &MostVisitedHandler::HandleGetMostVisited)); // Register ourselves for any most-visited item blacklisting. - dom_ui_->RegisterMessageCallback("blacklistURLFromMostVisited", + web_ui_->RegisterMessageCallback("blacklistURLFromMostVisited", NewCallback(this, &MostVisitedHandler::HandleBlacklistURL)); - dom_ui_->RegisterMessageCallback("removeURLsFromMostVisitedBlacklist", + web_ui_->RegisterMessageCallback("removeURLsFromMostVisitedBlacklist", NewCallback(this, &MostVisitedHandler::HandleRemoveURLsFromBlacklist)); - dom_ui_->RegisterMessageCallback("clearMostVisitedURLsBlacklist", + web_ui_->RegisterMessageCallback("clearMostVisitedURLsBlacklist", NewCallback(this, &MostVisitedHandler::HandleClearBlacklist)); // Register ourself for pinned URL messages. - dom_ui_->RegisterMessageCallback("addPinnedURL", + web_ui_->RegisterMessageCallback("addPinnedURL", NewCallback(this, &MostVisitedHandler::HandleAddPinnedURL)); - dom_ui_->RegisterMessageCallback("removePinnedURL", + web_ui_->RegisterMessageCallback("removePinnedURL", NewCallback(this, &MostVisitedHandler::HandleRemovePinnedURL)); } @@ -122,12 +122,12 @@ void MostVisitedHandler::HandleGetMostVisited(const ListValue* args) { void MostVisitedHandler::SendPagesValue() { if (pages_value_.get()) { bool has_blacklisted_urls = !url_blacklist_->empty(); - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) has_blacklisted_urls = ts->HasBlacklistedItems(); FundamentalValue first_run(IsFirstRun()); FundamentalValue has_blacklisted_urls_value(has_blacklisted_urls); - dom_ui_->CallJavascriptFunction(L"mostVisitedPages", + web_ui_->CallJavascriptFunction(L"mostVisitedPages", *(pages_value_.get()), first_run, has_blacklisted_urls_value); @@ -137,7 +137,7 @@ void MostVisitedHandler::SendPagesValue() { void MostVisitedHandler::StartQueryForMostVisited() { // Use TopSites. - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) { ts->GetMostVisitedURLs( &topsites_consumer_, @@ -162,8 +162,8 @@ void MostVisitedHandler::HandleRemoveURLsFromBlacklist(const ListValue* args) { return; } UserMetrics::RecordAction(UserMetricsAction("MostVisited_UrlRemoved"), - dom_ui_->GetProfile()); - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + web_ui_->GetProfile()); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) ts->RemoveBlacklistedURL(GURL(url)); } @@ -171,9 +171,9 @@ void MostVisitedHandler::HandleRemoveURLsFromBlacklist(const ListValue* args) { void MostVisitedHandler::HandleClearBlacklist(const ListValue* args) { UserMetrics::RecordAction(UserMetricsAction("MostVisited_BlacklistCleared"), - dom_ui_->GetProfile()); + web_ui_->GetProfile()); - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) ts->ClearBlacklistedURLs(); } @@ -213,7 +213,7 @@ void MostVisitedHandler::HandleAddPinnedURL(const ListValue* args) { } void MostVisitedHandler::AddPinnedURL(const MostVisitedPage& page, int index) { - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) ts->AddPinnedURL(page.url, index); } @@ -224,7 +224,7 @@ void MostVisitedHandler::HandleRemovePinnedURL(const ListValue* args) { } void MostVisitedHandler::RemovePinnedURL(const GURL& url) { - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) ts->RemovePinnedURL(url); } @@ -298,7 +298,7 @@ void MostVisitedHandler::SetPagesValueFromTopSites( "chrome://theme/IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL"); } - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts && ts->IsURLPinned(url.url)) page_value->SetBoolean("pinned", true); pages_value_->Append(page_value); @@ -361,7 +361,7 @@ void MostVisitedHandler::Observe(NotificationType type, } void MostVisitedHandler::BlacklistURL(const GURL& url) { - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); + history::TopSites* ts = web_ui_->GetProfile()->GetTopSites(); if (ts) ts->AddBlacklistedURL(url); } diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc index cde4366..adc135f 100644 --- a/chrome/browser/dom_ui/net_internals_ui.cc +++ b/chrome/browser/dom_ui/net_internals_ui.cc @@ -469,66 +469,66 @@ void NetInternalsMessageHandler::OnLoadLogFile(const ListValue* list) { select_log_file_dialog_->SelectFile( SelectFileDialog::SELECT_OPEN_FILE, string16(), FilePath(), NULL, 0, FILE_PATH_LITERAL(""), - dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); + web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); } void NetInternalsMessageHandler::RegisterMessages() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); // Only callback handled on UI thread. - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "loadLogFile", NewCallback(this, &NetInternalsMessageHandler::OnLoadLogFile)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "notifyReady", proxy_->CreateCallback(&IOThreadImpl::OnRendererReady)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getProxySettings", proxy_->CreateCallback(&IOThreadImpl::OnGetProxySettings)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "reloadProxySettings", proxy_->CreateCallback(&IOThreadImpl::OnReloadProxySettings)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getBadProxies", proxy_->CreateCallback(&IOThreadImpl::OnGetBadProxies)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "clearBadProxies", proxy_->CreateCallback(&IOThreadImpl::OnClearBadProxies)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getHostResolverInfo", proxy_->CreateCallback(&IOThreadImpl::OnGetHostResolverInfo)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "clearHostResolverCache", proxy_->CreateCallback(&IOThreadImpl::OnClearHostResolverCache)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "enableIPv6", proxy_->CreateCallback(&IOThreadImpl::OnEnableIPv6)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "startConnectionTests", proxy_->CreateCallback(&IOThreadImpl::OnStartConnectionTests)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getHttpCacheInfo", proxy_->CreateCallback(&IOThreadImpl::OnGetHttpCacheInfo)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getSocketPoolInfo", proxy_->CreateCallback(&IOThreadImpl::OnGetSocketPoolInfo)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getSpdySessionInfo", proxy_->CreateCallback(&IOThreadImpl::OnGetSpdySessionInfo)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getSpdyStatus", proxy_->CreateCallback(&IOThreadImpl::OnGetSpdyStatus)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getSpdyAlternateProtocolMappings", proxy_->CreateCallback( &IOThreadImpl::OnGetSpdyAlternateProtocolMappings)); #ifdef OS_WIN - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "getServiceProviders", proxy_->CreateCallback(&IOThreadImpl::OnGetServiceProviders)); #endif - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setLogLevel", proxy_->CreateCallback(&IOThreadImpl::OnSetLogLevel)); } @@ -538,9 +538,9 @@ void NetInternalsMessageHandler::CallJavascriptFunction( const Value* value) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (value) { - dom_ui_->CallJavascriptFunction(function_name, *value); + web_ui_->CallJavascriptFunction(function_name, *value); } else { - dom_ui_->CallJavascriptFunction(function_name); + web_ui_->CallJavascriptFunction(function_name); } } diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index 2a0fa59..ec3da8b 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -106,9 +106,9 @@ WebUIMessageHandler* NewTabPageSyncHandler::Attach(WebUI* web_ui) { } void NewTabPageSyncHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("GetSyncMessage", + web_ui_->RegisterMessageCallback("GetSyncMessage", NewCallback(this, &NewTabPageSyncHandler::HandleGetSyncMessage)); - dom_ui_->RegisterMessageCallback("SyncLinkClicked", + web_ui_->RegisterMessageCallback("SyncLinkClicked", NewCallback(this, &NewTabPageSyncHandler::HandleSyncLinkClicked)); } @@ -162,7 +162,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const ListValue* args) { value.SetString("syncEnabledMessage", l10n_util::GetStringFUTF16(IDS_SYNC_NTP_SYNCED_TO, sync_service_->GetAuthenticatedUsername())); - dom_ui_->CallJavascriptFunction(L"syncAlreadyEnabled", value); + web_ui_->CallJavascriptFunction(L"syncAlreadyEnabled", value); } else { // User clicked the 'Start now' link to begin syncing. ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_NTP); @@ -217,5 +217,5 @@ void NewTabPageSyncHandler::SendSyncMessageToPage( } } } - dom_ui_->CallJavascriptFunction(L"syncMessageChanged", value); + web_ui_->CallJavascriptFunction(L"syncMessageChanged", value); } diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 5e65053..1cc4f55 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -101,10 +101,10 @@ class RecentlyClosedTabsHandler : public WebUIMessageHandler, }; void RecentlyClosedTabsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getRecentlyClosedTabs", + web_ui_->RegisterMessageCallback("getRecentlyClosedTabs", NewCallback(this, &RecentlyClosedTabsHandler::HandleGetRecentlyClosedTabs)); - dom_ui_->RegisterMessageCallback("reopenTab", + web_ui_->RegisterMessageCallback("reopenTab", NewCallback(this, &RecentlyClosedTabsHandler::HandleReopenTab)); } @@ -115,7 +115,7 @@ RecentlyClosedTabsHandler::~RecentlyClosedTabsHandler() { void RecentlyClosedTabsHandler::HandleReopenTab(const ListValue* args) { Browser* browser = Browser::GetBrowserForController( - &dom_ui_->tab_contents()->controller(), NULL); + &web_ui_->tab_contents()->controller(), NULL); if (!browser) return; @@ -129,7 +129,7 @@ void RecentlyClosedTabsHandler::HandleReopenTab(const ListValue* args) { void RecentlyClosedTabsHandler::HandleGetRecentlyClosedTabs( const ListValue* args) { if (!tab_restore_service_) { - tab_restore_service_ = dom_ui_->GetProfile()->GetTabRestoreService(); + tab_restore_service_ = web_ui_->GetProfile()->GetTabRestoreService(); // GetTabRestoreService() can return NULL (i.e., when in Off the // Record mode) @@ -151,7 +151,7 @@ void RecentlyClosedTabsHandler::TabRestoreServiceChanged( ListValue list_value; NewTabUI::AddRecentlyClosedEntries(service->entries(), &list_value); - dom_ui_->CallJavascriptFunction(L"recentlyClosedTabs", list_value); + web_ui_->CallJavascriptFunction(L"recentlyClosedTabs", list_value); } void RecentlyClosedTabsHandler::TabRestoreServiceDestroyed( @@ -188,21 +188,21 @@ class MetricsHandler : public WebUIMessageHandler { }; void MetricsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("metrics", + web_ui_->RegisterMessageCallback("metrics", NewCallback(this, &MetricsHandler::HandleMetrics)); - dom_ui_->RegisterMessageCallback("logEventTime", + web_ui_->RegisterMessageCallback("logEventTime", NewCallback(this, &MetricsHandler::HandleLogEventTime)); } void MetricsHandler::HandleMetrics(const ListValue* args) { std::string string_action = WideToUTF8(ExtractStringValue(args)); - UserMetrics::RecordComputedAction(string_action, dom_ui_->GetProfile()); + UserMetrics::RecordComputedAction(string_action, web_ui_->GetProfile()); } void MetricsHandler::HandleLogEventTime(const ListValue* args) { std::string event_name = WideToUTF8(ExtractStringValue(args)); - dom_ui_->tab_contents()->LogNewTabTime(event_name); + web_ui_->tab_contents()->LogNewTabTime(event_name); } /////////////////////////////////////////////////////////////////////////////// @@ -227,20 +227,20 @@ class NewTabPageSetHomePageHandler : public WebUIMessageHandler { }; void NewTabPageSetHomePageHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("setHomePage", NewCallback( + web_ui_->RegisterMessageCallback("setHomePage", NewCallback( this, &NewTabPageSetHomePageHandler::HandleSetHomePage)); } void NewTabPageSetHomePageHandler::HandleSetHomePage( const ListValue* args) { - dom_ui_->GetProfile()->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, + web_ui_->GetProfile()->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true); ListValue list_value; list_value.Append(new StringValue( l10n_util::GetStringUTF16(IDS_NEW_TAB_HOME_PAGE_SET_NOTIFICATION))); list_value.Append(new StringValue( l10n_util::GetStringUTF16(IDS_NEW_TAB_HOME_PAGE_HIDE_NOTIFICATION))); - dom_ui_->CallJavascriptFunction(L"onHomePageSet", list_value); + web_ui_->CallJavascriptFunction(L"onHomePageSet", list_value); } /////////////////////////////////////////////////////////////////////////////// @@ -265,13 +265,13 @@ class NewTabPageClosePromoHandler : public WebUIMessageHandler { }; void NewTabPageClosePromoHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("closePromo", NewCallback( + web_ui_->RegisterMessageCallback("closePromo", NewCallback( this, &NewTabPageClosePromoHandler::HandleClosePromo)); } void NewTabPageClosePromoHandler::HandleClosePromo( const ListValue* args) { - dom_ui_->GetProfile()->GetPrefs()->SetBoolean(prefs::kNTPPromoClosed, true); + web_ui_->GetProfile()->GetPrefs()->SetBoolean(prefs::kNTPPromoClosed, true); NotificationService* service = NotificationService::current(); service->Notify(NotificationType::WEB_RESOURCE_STATE_CHANGED, Source<NewTabPageClosePromoHandler>(this), diff --git a/chrome/browser/dom_ui/ntp_login_handler.cc b/chrome/browser/dom_ui/ntp_login_handler.cc index f173d76..52faf92c 100644 --- a/chrome/browser/dom_ui/ntp_login_handler.cc +++ b/chrome/browser/dom_ui/ntp_login_handler.cc @@ -30,7 +30,7 @@ WebUIMessageHandler* NTPLoginHandler::Attach(WebUI* web_ui) { } void NTPLoginHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("initializeLogin", + web_ui_->RegisterMessageCallback("initializeLogin", NewCallback(this, &NTPLoginHandler::HandleInitializeLogin)); } @@ -48,8 +48,8 @@ void NTPLoginHandler::HandleInitializeLogin(const ListValue* args) { } void NTPLoginHandler::UpdateLogin() { - std::string username = dom_ui_->GetProfile()->GetPrefs()->GetString( + std::string username = web_ui_->GetProfile()->GetPrefs()->GetString( prefs::kGoogleServicesUsername); StringValue string_value(username); - dom_ui_->CallJavascriptFunction(L"updateLogin", string_value); + web_ui_->CallJavascriptFunction(L"updateLogin", string_value); } diff --git a/chrome/browser/dom_ui/options/about_page_handler.cc b/chrome/browser/dom_ui/options/about_page_handler.cc index d2a9d7e..4291454 100644 --- a/chrome/browser/dom_ui/options/about_page_handler.cc +++ b/chrome/browser/dom_ui/options/about_page_handler.cc @@ -268,15 +268,15 @@ void AboutPageHandler::GetLocalizedValues(DictionaryValue* localized_strings) { } void AboutPageHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("PageReady", + web_ui_->RegisterMessageCallback("PageReady", NewCallback(this, &AboutPageHandler::PageReady)); - dom_ui_->RegisterMessageCallback("SetReleaseTrack", + web_ui_->RegisterMessageCallback("SetReleaseTrack", NewCallback(this, &AboutPageHandler::SetReleaseTrack)); #if defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback("CheckNow", + web_ui_->RegisterMessageCallback("CheckNow", NewCallback(this, &AboutPageHandler::CheckNow)); - dom_ui_->RegisterMessageCallback("RestartNow", + web_ui_->RegisterMessageCallback("RestartNow", NewCallback(this, &AboutPageHandler::RestartNow)); #endif } @@ -294,7 +294,7 @@ void AboutPageHandler::PageReady(const ListValue* args) { // Update the channel information. std::string channel = update_library->GetReleaseTrack(); scoped_ptr<Value> channel_string(Value::CreateStringValue(channel)); - dom_ui_->CallJavascriptFunction(L"AboutPage.updateSelectedOptionCallback", + web_ui_->CallJavascriptFunction(L"AboutPage.updateSelectedOptionCallback", *channel_string); update_observer_.reset(new UpdateObserver(this)); @@ -404,20 +404,20 @@ void AboutPageHandler::UpdateStatus( // can read it, hence insert delay for this. scoped_ptr<Value> insert_delay(Value::CreateBooleanValue( status.status == chromeos::UPDATE_STATUS_CHECKING_FOR_UPDATE)); - dom_ui_->CallJavascriptFunction(L"AboutPage.updateStatusCallback", + web_ui_->CallJavascriptFunction(L"AboutPage.updateStatusCallback", *update_message, *insert_delay); scoped_ptr<Value> enabled_value(Value::CreateBooleanValue(enabled)); - dom_ui_->CallJavascriptFunction(L"AboutPage.updateEnableCallback", + web_ui_->CallJavascriptFunction(L"AboutPage.updateEnableCallback", *enabled_value); scoped_ptr<Value> image_string(Value::CreateStringValue(image)); - dom_ui_->CallJavascriptFunction(L"AboutPage.setUpdateImage", + web_ui_->CallJavascriptFunction(L"AboutPage.setUpdateImage", *image_string); } // We'll change the "Check For Update" button to "Restart" button. if (status.status == chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) { - dom_ui_->CallJavascriptFunction(L"AboutPage.changeToRestartButton"); + web_ui_->CallJavascriptFunction(L"AboutPage.changeToRestartButton"); } } @@ -425,7 +425,7 @@ void AboutPageHandler::OnOSVersion(chromeos::VersionLoader::Handle handle, std::string version) { if (version.size()) { scoped_ptr<Value> version_string(Value::CreateStringValue(version)); - dom_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", + web_ui_->CallJavascriptFunction(L"AboutPage.updateOSVersionCallback", *version_string); } } diff --git a/chrome/browser/dom_ui/options/add_startup_page_handler.cc b/chrome/browser/dom_ui/options/add_startup_page_handler.cc index 616ca68..9ecf5d0 100644 --- a/chrome/browser/dom_ui/options/add_startup_page_handler.cc +++ b/chrome/browser/dom_ui/options/add_startup_page_handler.cc @@ -40,12 +40,12 @@ void AddStartupPageHandler::Initialize() { url_table_model_.reset(new PossibleURLModel()); if (url_table_model_.get()) { url_table_model_->SetObserver(this); - url_table_model_->Reload(dom_ui_->GetProfile()); + url_table_model_->Reload(web_ui_->GetProfile()); } } void AddStartupPageHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "updateAddStartupFieldWithPage", NewCallback(this, &AddStartupPageHandler::UpdateFieldWithRecentPage)); } @@ -57,7 +57,7 @@ void AddStartupPageHandler::UpdateFieldWithRecentPage(const ListValue* args) { return; } std::string languages = - dom_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages); + web_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages); // Because this gets parsed by FixupURL(), it's safe to omit the scheme or // trailing slash, and unescape most characters, but we need to not drop any // username/password, or unescape anything that changes the meaning. @@ -66,7 +66,7 @@ void AddStartupPageHandler::UpdateFieldWithRecentPage(const ListValue* args) { UnescapeRule::SPACES, NULL, NULL, NULL); scoped_ptr<Value> url_value(Value::CreateStringValue(url_string)); - dom_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.setInputFieldValue", + web_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.setInputFieldValue", *url_value.get()); } @@ -81,7 +81,7 @@ void AddStartupPageHandler::OnModelChanged() { pages.Append(dict); } - dom_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.updateRecentPageList", + web_ui_->CallJavascriptFunction(L"AddStartupPageOverlay.updateRecentPageList", pages); } diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc index a8b1d8b..f9885c2 100644 --- a/chrome/browser/dom_ui/options/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc @@ -194,7 +194,7 @@ void AdvancedOptionsHandler::GetLocalizedValues( } void AdvancedOptionsHandler::Initialize() { - DCHECK(dom_ui_); + DCHECK(web_ui_); SetupMetricsReportingCheckbox(); SetupMetricsReportingSettingVisibility(); SetupFontSizeLabel(); @@ -216,12 +216,12 @@ void AdvancedOptionsHandler::Initialize() { if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) { RemoveRemotingSection(); } else { - remoting_options_handler_.Init(dom_ui_); + remoting_options_handler_.Init(web_ui_); } #endif banner_handler_.reset( - new OptionsManagedBannerHandler(dom_ui_, + new OptionsManagedBannerHandler(web_ui_, ASCIIToUTF16("AdvancedOptions"), OPTIONS_PAGE_ADVANCED)); } @@ -232,8 +232,8 @@ WebUIMessageHandler* AdvancedOptionsHandler::Attach(WebUI* web_ui) { // Register for preferences that we need to observe manually. These have // special behaviors that aren't handled by the standard prefs UI. - DCHECK(dom_ui_); - PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + DCHECK(web_ui_); + PrefService* prefs = web_ui_->GetProfile()->GetPrefs(); #if !defined(OS_CHROMEOS) enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled, g_browser_process->local_state(), this); @@ -255,61 +255,61 @@ WebUIMessageHandler* AdvancedOptionsHandler::Attach(WebUI* web_ui) { void AdvancedOptionsHandler::RegisterMessages() { // Setup handlers specific to this panel. - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("selectDownloadLocation", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("selectDownloadLocation", NewCallback(this, &AdvancedOptionsHandler::HandleSelectDownloadLocation)); - dom_ui_->RegisterMessageCallback("autoOpenFileTypesAction", + web_ui_->RegisterMessageCallback("autoOpenFileTypesAction", NewCallback(this, &AdvancedOptionsHandler::HandleAutoOpenButton)); - dom_ui_->RegisterMessageCallback("defaultFontSizeAction", + web_ui_->RegisterMessageCallback("defaultFontSizeAction", NewCallback(this, &AdvancedOptionsHandler::HandleDefaultFontSize)); #if !defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback("metricsReportingCheckboxAction", + web_ui_->RegisterMessageCallback("metricsReportingCheckboxAction", NewCallback(this, &AdvancedOptionsHandler::HandleMetricsReportingCheckbox)); #endif #if !defined(USE_NSS) && !defined(USE_OPENSSL) - dom_ui_->RegisterMessageCallback("showManageSSLCertificates", + web_ui_->RegisterMessageCallback("showManageSSLCertificates", NewCallback(this, &AdvancedOptionsHandler::ShowManageSSLCertificates)); #endif #if !defined(OS_CHROMEOS) if (cloud_print_proxy_ui_enabled_) { - dom_ui_->RegisterMessageCallback("showCloudPrintSetupDialog", + web_ui_->RegisterMessageCallback("showCloudPrintSetupDialog", NewCallback(this, &AdvancedOptionsHandler::ShowCloudPrintSetupDialog)); - dom_ui_->RegisterMessageCallback("disableCloudPrintProxy", + web_ui_->RegisterMessageCallback("disableCloudPrintProxy", NewCallback(this, &AdvancedOptionsHandler::HandleDisableCloudPrintProxy)); - dom_ui_->RegisterMessageCallback("showCloudPrintManagePage", + web_ui_->RegisterMessageCallback("showCloudPrintManagePage", NewCallback(this, &AdvancedOptionsHandler::ShowCloudPrintManagePage)); } - dom_ui_->RegisterMessageCallback("showNetworkProxySettings", + web_ui_->RegisterMessageCallback("showNetworkProxySettings", NewCallback(this, &AdvancedOptionsHandler::ShowNetworkProxySettings)); #endif #if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback("showRemotingSetupDialog", + web_ui_->RegisterMessageCallback("showRemotingSetupDialog", NewCallback(this, &AdvancedOptionsHandler::ShowRemotingSetupDialog)); - dom_ui_->RegisterMessageCallback("disableRemoting", + web_ui_->RegisterMessageCallback("disableRemoting", NewCallback(this, &AdvancedOptionsHandler::DisableRemoting)); #endif #if defined(OS_WIN) // Setup Windows specific callbacks. - dom_ui_->RegisterMessageCallback("checkRevocationCheckboxAction", + web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction", NewCallback(this, &AdvancedOptionsHandler::HandleCheckRevocationCheckbox)); - dom_ui_->RegisterMessageCallback("useSSL3CheckboxAction", + web_ui_->RegisterMessageCallback("useSSL3CheckboxAction", NewCallback(this, &AdvancedOptionsHandler::HandleUseSSL3Checkbox)); - dom_ui_->RegisterMessageCallback("useTLS1CheckboxAction", + web_ui_->RegisterMessageCallback("useTLS1CheckboxAction", NewCallback(this, &AdvancedOptionsHandler::HandleUseTLS1Checkbox)); - dom_ui_->RegisterMessageCallback("showGearsSettings", + web_ui_->RegisterMessageCallback("showGearsSettings", NewCallback(this, &AdvancedOptionsHandler::HandleShowGearsSettings)); #endif @@ -341,14 +341,14 @@ void AdvancedOptionsHandler::Observe(NotificationType type, void AdvancedOptionsHandler::HandleSelectDownloadLocation( const ListValue* args) { - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); select_folder_dialog_ = SelectFileDialog::Create(this); select_folder_dialog_->SelectFile( SelectFileDialog::SELECT_FOLDER, l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE), pref_service->GetFilePath(prefs::kDownloadDefaultDirectory), NULL, 0, FILE_PATH_LITERAL(""), - dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); + web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); } void AdvancedOptionsHandler::FileSelected(const FilePath& path, int index, @@ -367,7 +367,7 @@ void AdvancedOptionsHandler::OnDialogClosed() { void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_ResetAutoOpenFiles")); - DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager(); + DownloadManager* manager = web_ui_->GetProfile()->GetDownloadManager(); if (manager) manager->download_prefs()->ResetAutoOpen(); } @@ -431,21 +431,21 @@ void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) { void AdvancedOptionsHandler::HandleShowGearsSettings(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_GearsSettings")); GearsSettingsPressed( - dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow()); + web_ui_->tab_contents()->view()->GetTopLevelNativeWindow()); } #endif #if !defined(OS_CHROMEOS) void AdvancedOptionsHandler::ShowNetworkProxySettings(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_ShowProxySettings")); - AdvancedOptionsUtilities::ShowNetworkProxySettings(dom_ui_->tab_contents()); + AdvancedOptionsUtilities::ShowNetworkProxySettings(web_ui_->tab_contents()); } #endif #if !defined(USE_NSS) && !defined(USE_OPENSSL) void AdvancedOptionsHandler::ShowManageSSLCertificates(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_ManageSSLCertificates")); - AdvancedOptionsUtilities::ShowManageSSLCertificates(dom_ui_->tab_contents()); + AdvancedOptionsUtilities::ShowManageSSLCertificates(web_ui_->tab_contents()); } #endif @@ -453,33 +453,33 @@ void AdvancedOptionsHandler::ShowManageSSLCertificates(const ListValue* args) { void AdvancedOptionsHandler::ShowCloudPrintSetupDialog(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_EnableCloudPrintProxy")); CloudPrintSetupFlow::OpenDialog( - dom_ui_->GetProfile(), this, - dom_ui_->tab_contents()->GetMessageBoxRootWindow()); + web_ui_->GetProfile(), this, + web_ui_->tab_contents()->GetMessageBoxRootWindow()); } void AdvancedOptionsHandler::HandleDisableCloudPrintProxy( const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_DisableCloudPrintProxy")); - dom_ui_->GetProfile()->GetCloudPrintProxyService()->DisableForUser(); + web_ui_->GetProfile()->GetCloudPrintProxyService()->DisableForUser(); } void AdvancedOptionsHandler::ShowCloudPrintManagePage(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_ManageCloudPrinters")); // Open a new tab in the current window for the management page. - dom_ui_->tab_contents()->OpenURL( - CloudPrintURL(dom_ui_->GetProfile()).GetCloudPrintServiceManageURL(), + web_ui_->tab_contents()->OpenURL( + CloudPrintURL(web_ui_->GetProfile()).GetCloudPrintServiceManageURL(), GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); } void AdvancedOptionsHandler::RefreshCloudPrintStatusFromService() { - DCHECK(dom_ui_); + DCHECK(web_ui_); if (cloud_print_proxy_ui_enabled_) - dom_ui_->GetProfile()->GetCloudPrintProxyService()-> + web_ui_->GetProfile()->GetCloudPrintProxyService()-> RefreshStatusFromService(); } void AdvancedOptionsHandler::SetupCloudPrintProxySection() { - if (NULL == dom_ui_->GetProfile()->GetCloudPrintProxyService()) { + if (NULL == web_ui_->GetProfile()->GetCloudPrintProxyService()) { cloud_print_proxy_ui_enabled_ = false; RemoveCloudPrintProxySection(); return; @@ -491,9 +491,9 @@ void AdvancedOptionsHandler::SetupCloudPrintProxySection() { FundamentalValue allowed(cloud_print_proxy_allowed); std::string email; - if (dom_ui_->GetProfile()->GetPrefs()->HasPrefPath(prefs::kCloudPrintEmail) && + if (web_ui_->GetProfile()->GetPrefs()->HasPrefPath(prefs::kCloudPrintEmail) && cloud_print_proxy_allowed) { - email = dom_ui_->GetProfile()->GetPrefs()->GetString( + email = web_ui_->GetProfile()->GetPrefs()->GetString( prefs::kCloudPrintEmail); } FundamentalValue disabled(email.empty()); @@ -508,13 +508,13 @@ void AdvancedOptionsHandler::SetupCloudPrintProxySection() { } StringValue label(label_str); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetupCloudPrintProxySection", disabled, label, allowed); } void AdvancedOptionsHandler::RemoveCloudPrintProxySection() { - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.RemoveCloudPrintProxySection"); } @@ -522,18 +522,18 @@ void AdvancedOptionsHandler::RemoveCloudPrintProxySection() { #if defined(ENABLE_REMOTING) && !defined(OS_CHROMEOS) void AdvancedOptionsHandler::RemoveRemotingSection() { - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.RemoveRemotingSection"); } void AdvancedOptionsHandler::ShowRemotingSetupDialog(const ListValue* args) { - remoting::SetupFlow::OpenSetupDialog(dom_ui_->GetProfile()); + remoting::SetupFlow::OpenSetupDialog(web_ui_->GetProfile()); } void AdvancedOptionsHandler::DisableRemoting(const ListValue* args) { ServiceProcessControl* process_control = ServiceProcessControlManager::GetInstance()->GetProcessControl( - dom_ui_->GetProfile()); + web_ui_->GetProfile()); if (!process_control || !process_control->is_connected()) return; process_control->DisableRemotingHost(); @@ -544,7 +544,7 @@ void AdvancedOptionsHandler::SetupMetricsReportingCheckbox() { #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) FundamentalValue checked(enable_metrics_recording_.GetValue()); FundamentalValue disabled(enable_metrics_recording_.IsManaged()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetMetricsReportingCheckboxState", checked, disabled); #endif @@ -555,7 +555,7 @@ void AdvancedOptionsHandler::SetupMetricsReportingSettingVisibility() { // Don't show the reporting setting if we are in the guest mode. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { FundamentalValue visible(false); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetMetricsReportingSettingVisibility", visible); } @@ -566,31 +566,31 @@ void AdvancedOptionsHandler::SetupFontSizeLabel() { // We're only interested in integer values, so convert to int. FundamentalValue fixed_font_size(default_fixed_font_size_.GetValue()); FundamentalValue font_size(default_font_size_.GetValue()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetFontSize", fixed_font_size, font_size); } void AdvancedOptionsHandler::SetupDownloadLocationPath() { StringValue value(default_download_location_.GetValue().value()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetDownloadLocationPath", value); } void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() { // Set the enabled state for the AutoOpenFileTypesResetToDefault button. // We enable the button if the user has any auto-open file types registered. - DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager(); + DownloadManager* manager = web_ui_->GetProfile()->GetDownloadManager(); bool disabled = !(manager && manager->download_prefs()->IsAutoOpenUsed()); FundamentalValue value(disabled); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value); } void AdvancedOptionsHandler::SetupProxySettingsSection() { // Disable the button if proxy settings are managed by a sysadmin or // overridden by an extension. - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); const PrefService::Preference* proxy_config = pref_service->FindPreference(prefs::kProxy); bool is_extension_controlled = (proxy_config && @@ -609,7 +609,7 @@ void AdvancedOptionsHandler::SetupProxySettingsSection() { } StringValue label(label_str); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetupProxySettingsSection", disabled, label); } @@ -630,15 +630,15 @@ void AdvancedOptionsHandler::SetupSSLConfigSettings() { } FundamentalValue disabledValue(disabled); FundamentalValue checkRevocationValue(checkRevocationSetting); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetCheckRevocationCheckboxState", checkRevocationValue, disabledValue); FundamentalValue useSSL3Value(useSSL3Setting); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetUseSSL3CheckboxState", useSSL3Value, disabledValue); FundamentalValue useTLS1Value(useTLS1Setting); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.AdvancedOptions.SetUseTLS1CheckboxState", useTLS1Value, disabledValue); } diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc index 946f77c4..fbb0ce9 100644 --- a/chrome/browser/dom_ui/options/autofill_options_handler.cc +++ b/chrome/browser/dom_ui/options/autofill_options_handler.cc @@ -94,29 +94,29 @@ void AutoFillOptionsHandler::GetLocalizedValues( } void AutoFillOptionsHandler::Initialize() { - personal_data_ = dom_ui_->GetProfile()->GetPersonalDataManager(); + personal_data_ = web_ui_->GetProfile()->GetPersonalDataManager(); personal_data_->SetObserver(this); LoadAutoFillData(); } void AutoFillOptionsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "removeAddress", NewCallback(this, &AutoFillOptionsHandler::RemoveAddress)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "removeCreditCard", NewCallback(this, &AutoFillOptionsHandler::RemoveCreditCard)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "loadAddressEditor", NewCallback(this, &AutoFillOptionsHandler::LoadAddressEditor)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "loadCreditCardEditor", NewCallback(this, &AutoFillOptionsHandler::LoadCreditCardEditor)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setAddress", NewCallback(this, &AutoFillOptionsHandler::SetAddress)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setCreditCard", NewCallback(this, &AutoFillOptionsHandler::SetCreditCard)); } @@ -187,7 +187,7 @@ void AutoFillOptionsHandler::LoadAutoFillData() { addresses.Append(entry); } - dom_ui_->CallJavascriptFunction(L"AutoFillOptions.setAddressList", + web_ui_->CallJavascriptFunction(L"AutoFillOptions.setAddressList", addresses); ListValue credit_cards; @@ -203,7 +203,7 @@ void AutoFillOptionsHandler::LoadAutoFillData() { credit_cards.Append(entry); } - dom_ui_->CallJavascriptFunction(L"AutoFillOptions.setCreditCardList", + web_ui_->CallJavascriptFunction(L"AutoFillOptions.setCreditCardList", credit_cards); } @@ -281,7 +281,7 @@ void AutoFillOptionsHandler::LoadAddressEditor(const ListValue* args) { profile->GetFieldText(AutoFillType(EMAIL_ADDRESS))); addressList.Append(address); - dom_ui_->CallJavascriptFunction(L"AutoFillOptions.editAddress", + web_ui_->CallJavascriptFunction(L"AutoFillOptions.editAddress", addressList); } @@ -325,7 +325,7 @@ void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) { credit_card->GetFieldText(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR))); credit_card_list.Append(credit_card_data); - dom_ui_->CallJavascriptFunction(L"AutoFillOptions.editCreditCard", + web_ui_->CallJavascriptFunction(L"AutoFillOptions.editCreditCard", credit_card_list); } diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc index c5efe1c..4d87049 100644 --- a/chrome/browser/dom_ui/options/browser_options_handler.cc +++ b/chrome/browser/dom_ui/options/browser_options_handler.cc @@ -103,31 +103,31 @@ void BrowserOptionsHandler::GetLocalizedValues( } void BrowserOptionsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setHomePage", NewCallback(this, &BrowserOptionsHandler::SetHomePage)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "becomeDefaultBrowser", NewCallback(this, &BrowserOptionsHandler::BecomeDefaultBrowser)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setDefaultSearchEngine", NewCallback(this, &BrowserOptionsHandler::SetDefaultSearchEngine)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "removeStartupPages", NewCallback(this, &BrowserOptionsHandler::RemoveStartupPages)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "addStartupPage", NewCallback(this, &BrowserOptionsHandler::AddStartupPage)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "editStartupPage", NewCallback(this, &BrowserOptionsHandler::EditStartupPage)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "setStartupPagesToCurrentPages", NewCallback(this, &BrowserOptionsHandler::SetStartupPagesToCurrentPages)); } void BrowserOptionsHandler::Initialize() { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); // Create our favicon data source. profile->GetChromeURLDataManager()->AddDataSource( @@ -141,7 +141,7 @@ void BrowserOptionsHandler::Initialize() { UpdateStartupPages(); UpdateSearchEngines(); banner_handler_.reset( - new OptionsManagedBannerHandler(dom_ui_, + new OptionsManagedBannerHandler(web_ui_, ASCIIToUTF16("BrowserOptions"), OPTIONS_PAGE_GENERAL)); } @@ -243,7 +243,7 @@ void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) { (status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT || status_string_id == IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT))); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"BrowserOptions.updateDefaultBrowserState", *(status_string.get()), *(is_default.get()), *(can_be_default.get())); } @@ -273,7 +273,7 @@ void BrowserOptionsHandler::OnTemplateURLModelChanged() { scoped_ptr<Value> default_value(Value::CreateIntegerValue(default_index)); - dom_ui_->CallJavascriptFunction(L"BrowserOptions.updateSearchEngines", + web_ui_->CallJavascriptFunction(L"BrowserOptions.updateSearchEngines", search_engines, *(default_value.get())); } @@ -294,7 +294,7 @@ void BrowserOptionsHandler::SetDefaultSearchEngine(const ListValue* args) { } void BrowserOptionsHandler::UpdateSearchEngines() { - template_url_model_ = dom_ui_->GetProfile()->GetTemplateURLModel(); + template_url_model_ = web_ui_->GetProfile()->GetTemplateURLModel(); if (template_url_model_) { template_url_model_->Load(); template_url_model_->AddObserver(this); @@ -303,7 +303,7 @@ void BrowserOptionsHandler::UpdateSearchEngines() { } void BrowserOptionsHandler::UpdateStartupPages() { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); startup_custom_pages_table_model_.reset( new CustomHomePagesTableModel(profile)); startup_custom_pages_table_model_->SetObserver(this); @@ -327,7 +327,7 @@ void BrowserOptionsHandler::OnModelChanged() { startup_pages.Append(entry); } - dom_ui_->CallJavascriptFunction(L"BrowserOptions.updateStartupPages", + web_ui_->CallJavascriptFunction(L"BrowserOptions.updateStartupPages", startup_pages); } @@ -418,7 +418,7 @@ void BrowserOptionsHandler::EditStartupPage(const ListValue* args) { } void BrowserOptionsHandler::SaveStartupPagesPref() { - PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + PrefService* prefs = web_ui_->GetProfile()->GetPrefs(); SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); pref.urls = startup_custom_pages_table_model_->GetURLs(); diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc index 903492d5..a0cd4ba 100644 --- a/chrome/browser/dom_ui/options/certificate_manager_handler.cc +++ b/chrome/browser/dom_ui/options/certificate_manager_handler.cc @@ -345,49 +345,49 @@ void CertificateManagerHandler::GetLocalizedValues( } void CertificateManagerHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("viewCertificate", + web_ui_->RegisterMessageCallback("viewCertificate", NewCallback(this, &CertificateManagerHandler::View)); - dom_ui_->RegisterMessageCallback("getCaCertificateTrust", + web_ui_->RegisterMessageCallback("getCaCertificateTrust", NewCallback(this, &CertificateManagerHandler::GetCATrust)); - dom_ui_->RegisterMessageCallback("editCaCertificateTrust", + web_ui_->RegisterMessageCallback("editCaCertificateTrust", NewCallback(this, &CertificateManagerHandler::EditCATrust)); - dom_ui_->RegisterMessageCallback("editServerCertificate", + web_ui_->RegisterMessageCallback("editServerCertificate", NewCallback(this, &CertificateManagerHandler::EditServer)); - dom_ui_->RegisterMessageCallback("cancelImportExportCertificate", + web_ui_->RegisterMessageCallback("cancelImportExportCertificate", NewCallback(this, &CertificateManagerHandler::CancelImportExportProcess)); - dom_ui_->RegisterMessageCallback("exportPersonalCertificate", + web_ui_->RegisterMessageCallback("exportPersonalCertificate", NewCallback(this, &CertificateManagerHandler::ExportPersonal)); - dom_ui_->RegisterMessageCallback("exportAllPersonalCertificates", + web_ui_->RegisterMessageCallback("exportAllPersonalCertificates", NewCallback(this, &CertificateManagerHandler::ExportAllPersonal)); - dom_ui_->RegisterMessageCallback("exportPersonalCertificatePasswordSelected", + web_ui_->RegisterMessageCallback("exportPersonalCertificatePasswordSelected", NewCallback(this, &CertificateManagerHandler::ExportPersonalPasswordSelected)); - dom_ui_->RegisterMessageCallback("importPersonalCertificate", + web_ui_->RegisterMessageCallback("importPersonalCertificate", NewCallback(this, &CertificateManagerHandler::StartImportPersonal)); - dom_ui_->RegisterMessageCallback("importPersonalCertificatePasswordSelected", + web_ui_->RegisterMessageCallback("importPersonalCertificatePasswordSelected", NewCallback(this, &CertificateManagerHandler::ImportPersonalPasswordSelected)); - dom_ui_->RegisterMessageCallback("importCaCertificate", + web_ui_->RegisterMessageCallback("importCaCertificate", NewCallback(this, &CertificateManagerHandler::ImportCA)); - dom_ui_->RegisterMessageCallback("importCaCertificateTrustSelected", + web_ui_->RegisterMessageCallback("importCaCertificateTrustSelected", NewCallback(this, &CertificateManagerHandler::ImportCATrustSelected)); - dom_ui_->RegisterMessageCallback("importServerCertificate", + web_ui_->RegisterMessageCallback("importServerCertificate", NewCallback(this, &CertificateManagerHandler::ImportServer)); - dom_ui_->RegisterMessageCallback("exportCertificate", + web_ui_->RegisterMessageCallback("exportCertificate", NewCallback(this, &CertificateManagerHandler::Export)); - dom_ui_->RegisterMessageCallback("deleteCertificate", + web_ui_->RegisterMessageCallback("deleteCertificate", NewCallback(this, &CertificateManagerHandler::Delete)); - dom_ui_->RegisterMessageCallback("populateCertificateManager", + web_ui_->RegisterMessageCallback("populateCertificateManager", NewCallback(this, &CertificateManagerHandler::Populate)); } @@ -442,7 +442,7 @@ void CertificateManagerHandler::View(const ListValue* args) { void CertificateManagerHandler::GetCATrust(const ListValue* args) { net::X509Certificate* cert = CallbackArgsToCert(args); if (!cert) { - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); return; } @@ -452,7 +452,7 @@ void CertificateManagerHandler::GetCATrust(const ListValue* args) { FundamentalValue email_value(bool(trust & net::CertDatabase::TRUSTED_EMAIL)); FundamentalValue obj_sign_value( bool(trust & net::CertDatabase::TRUSTED_OBJ_SIGN)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"CertificateEditCaTrustOverlay.populateTrust", ssl_value, email_value, obj_sign_value); } @@ -468,7 +468,7 @@ void CertificateManagerHandler::EditCATrust(const ListValue* args) { fail |= !CallbackArgsToBool(args, 3, &trust_obj_sign); if (fail) { LOG(ERROR) << "EditCATrust args fail"; - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); return; } @@ -478,7 +478,7 @@ void CertificateManagerHandler::EditCATrust(const ListValue* args) { trust_ssl * net::CertDatabase::TRUSTED_SSL + trust_email * net::CertDatabase::TRUSTED_EMAIL + trust_obj_sign * net::CertDatabase::TRUSTED_OBJ_SIGN); - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); if (!result) { // TODO(mattm): better error messages? ShowError( @@ -519,14 +519,14 @@ void CertificateManagerHandler::ExportAllPersonal(const ListValue* args) { void CertificateManagerHandler::ExportPersonalFileSelected( const FilePath& path) { file_path_ = path; - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"CertificateManager.exportPersonalAskPassword"); } void CertificateManagerHandler::ExportPersonalPasswordSelected( const ListValue* args) { if (!args->GetString(0, &password_)){ - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); ImportExportCleanup(); return; } @@ -551,7 +551,7 @@ void CertificateManagerHandler::ExportPersonalSlotsUnlocked() { password_, &output); if (!num_exported) { - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); ShowError( l10n_util::GetStringUTF8(IDS_CERT_MANAGER_PKCS12_EXPORT_ERROR_TITLE), l10n_util::GetStringUTF8(IDS_CERT_MANAGER_UNKNOWN_ERROR)); @@ -567,7 +567,7 @@ void CertificateManagerHandler::ExportPersonalSlotsUnlocked() { void CertificateManagerHandler::ExportPersonalFileWritten(int write_errno, int bytes_written) { - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); ImportExportCleanup(); if (write_errno) { ShowError( @@ -595,14 +595,14 @@ void CertificateManagerHandler::StartImportPersonal(const ListValue* args) { void CertificateManagerHandler::ImportPersonalFileSelected( const FilePath& path) { file_path_ = path; - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"CertificateManager.importPersonalAskPassword"); } void CertificateManagerHandler::ImportPersonalPasswordSelected( const ListValue* args) { if (!args->GetString(0, &password_)){ - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); ImportExportCleanup(); return; } @@ -616,7 +616,7 @@ void CertificateManagerHandler::ImportPersonalFileRead( int read_errno, std::string data) { if (read_errno) { ImportExportCleanup(); - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); ShowError( l10n_util::GetStringUTF8(IDS_CERT_MANAGER_PKCS12_IMPORT_ERROR_TITLE), l10n_util::GetStringFUTF8(IDS_CERT_MANAGER_READ_ERROR_FORMAT, @@ -641,7 +641,7 @@ void CertificateManagerHandler::ImportPersonalSlotUnlocked() { int result = certificate_manager_model_->ImportFromPKCS12( module_, file_data_, password_); ImportExportCleanup(); - dom_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss"); switch (result) { case net::OK: break; @@ -773,7 +773,7 @@ void CertificateManagerHandler::ImportCAFileRead(int read_errno, // TODO(mattm): check here if root_cert is not a CA cert and show error. StringValue cert_name(root_cert->subject().GetDisplayName()); - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.showImport", + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.showImport", cert_name); } @@ -788,7 +788,7 @@ void CertificateManagerHandler::ImportCATrustSelected(const ListValue* args) { if (fail) { LOG(ERROR) << "ImportCATrustSelected args fail"; ImportExportCleanup(); - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); return; } @@ -799,7 +799,7 @@ void CertificateManagerHandler::ImportCATrustSelected(const ListValue* args) { trust_email * net::CertDatabase::TRUSTED_EMAIL + trust_obj_sign * net::CertDatabase::TRUSTED_OBJ_SIGN, ¬_imported); - dom_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"CertificateEditCaTrustOverlay.dismiss"); if (!result) { ShowError( l10n_util::GetStringUTF8(IDS_CERT_MANAGER_CA_IMPORT_ERROR_TITLE), @@ -888,7 +888,7 @@ void CertificateManagerHandler::PopulateTree(const std::string& tab_name, ListValue args; args.Append(Value::CreateStringValue(tree_name)); args.Append(nodes); - dom_ui_->CallJavascriptFunction(L"CertificateManager.onPopulateTree", args); + web_ui_->CallJavascriptFunction(L"CertificateManager.onPopulateTree", args); } } @@ -901,7 +901,7 @@ void CertificateManagerHandler::ShowError(const std::string& title, args.push_back(Value::CreateNullValue()); // cancelTitle args.push_back(Value::CreateNullValue()); // okCallback args.push_back(Value::CreateNullValue()); // cancelCallback - dom_ui_->CallJavascriptFunction(L"AlertOverlay.show", args.get()); + web_ui_->CallJavascriptFunction(L"AlertOverlay.show", args.get()); } void CertificateManagerHandler::ShowImportErrors( @@ -927,12 +927,12 @@ void CertificateManagerHandler::ShowImportErrors( StringValue title_value(title); StringValue error_value(error); - dom_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show", + web_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show", title_value, error_value, cert_error_list); } gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { - return dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow(); + return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(); } diff --git a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc index 1aed648..08afd5d 100644 --- a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc +++ b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc @@ -92,8 +92,8 @@ void ClearBrowserDataHandler::GetLocalizedValues( void ClearBrowserDataHandler::RegisterMessages() { // Setup handlers specific to this panel. - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("performClearBrowserData", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("performClearBrowserData", NewCallback(this, &ClearBrowserDataHandler::HandleClearBrowserData)); } @@ -116,7 +116,7 @@ void ClearBrowserDataHandler::Observe(NotificationType type, } void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); PrefService* prefs = profile->GetPrefs(); int remove_mask = 0; @@ -139,7 +139,7 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) { int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod); FundamentalValue state(true); - dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.setClearingState", + web_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.setClearingState", state); // BrowsingDataRemover deletes itself when done. @@ -156,7 +156,7 @@ void ClearBrowserDataHandler::UpdateClearPluginLSOData() { IDS_DEL_COOKIES_CHKBOX; scoped_ptr<Value> label( Value::CreateStringValue(l10n_util::GetStringUTF16(label_id))); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ClearBrowserDataOverlay.setClearLocalDataLabel", *label); } @@ -164,6 +164,6 @@ void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() { // No need to remove ourselves as an observer as BrowsingDataRemover deletes // itself after we return. remover_ = NULL; - DCHECK(dom_ui_); - dom_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.doneClearing"); + DCHECK(web_ui_); + web_ui_->CallJavascriptFunction(L"ClearBrowserDataOverlay.doneClearing"); } diff --git a/chrome/browser/dom_ui/options/content_settings_handler.cc b/chrome/browser/dom_ui/options/content_settings_handler.cc index e63db8c..cec6278 100644 --- a/chrome/browser/dom_ui/options/content_settings_handler.cc +++ b/chrome/browser/dom_ui/options/content_settings_handler.cc @@ -301,7 +301,7 @@ void ContentSettingsHandler::Initialize() { const HostContentSettingsMap* settings_map = GetContentSettingsMap(); scoped_ptr<Value> block_3rd_party(Value::CreateBooleanValue( settings_map->BlockThirdPartyCookies())); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setBlockThirdPartyCookies", *block_3rd_party.get()); clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled, @@ -327,7 +327,7 @@ void ContentSettingsHandler::Initialize() { this, NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED, NotificationService::AllSources()); - PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + PrefService* prefs = web_ui_->GetProfile()->GetPrefs(); pref_change_registrar_.Init(prefs); pref_change_registrar_.Add(prefs::kGeolocationDefaultContentSetting, this); pref_change_registrar_.Add(prefs::kGeolocationContentSettings, this); @@ -340,7 +340,7 @@ void ContentSettingsHandler::Observe(NotificationType type, case NotificationType::PROFILE_DESTROYED: { Profile* profile = static_cast<Source<Profile> >(source).ptr(); if (profile->IsOffTheRecord()) { - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettingsExceptionsArea.OTRProfileDestroyed"); } break; @@ -395,7 +395,7 @@ void ContentSettingsHandler::UpdateClearPluginLSOData() { IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX; scoped_ptr<Value> label( Value::CreateStringValue(l10n_util::GetStringUTF16(label_id))); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setClearLocalDataOnShutdownLabel", *label); } @@ -407,7 +407,7 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel( filter_settings.SetBoolean(ContentSettingsTypeToGroupName(type) + ".managed", GetDefaultSettingManagedFromModel(type)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setContentFilterSettingsValue", filter_settings); } @@ -415,10 +415,10 @@ std::string ContentSettingsHandler::GetSettingDefaultFromModel( ContentSettingsType type) { ContentSetting default_setting; if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION) { - default_setting = dom_ui_->GetProfile()-> + default_setting = web_ui_->GetProfile()-> GetGeolocationContentSettingsMap()->GetDefaultContentSetting(); } else if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) { - default_setting = dom_ui_->GetProfile()-> + default_setting = web_ui_->GetProfile()-> GetDesktopNotificationService()->GetDefaultContentSetting(); } else { default_setting = GetContentSettingsMap()->GetDefaultContentSetting(type); @@ -430,10 +430,10 @@ std::string ContentSettingsHandler::GetSettingDefaultFromModel( bool ContentSettingsHandler::GetDefaultSettingManagedFromModel( ContentSettingsType type) { if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION) { - return dom_ui_->GetProfile()-> + return web_ui_->GetProfile()-> GetGeolocationContentSettingsMap()->IsDefaultContentSettingManaged(); } else if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) { - return dom_ui_->GetProfile()-> + return web_ui_->GetProfile()-> GetDesktopNotificationService()->IsDefaultContentSettingManaged(); } else { return GetContentSettingsMap()->IsDefaultContentSettingManaged(type); @@ -472,7 +472,7 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel( void ContentSettingsHandler::UpdateGeolocationExceptionsView() { GeolocationContentSettingsMap* map = - dom_ui_->GetProfile()->GetGeolocationContentSettingsMap(); + web_ui_->GetProfile()->GetGeolocationContentSettingsMap(); GeolocationContentSettingsMap::AllOriginsSettings all_settings = map->GetAllOriginsSettings(); GeolocationContentSettingsMap::AllOriginsSettings::const_iterator i; @@ -506,7 +506,7 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() { StringValue type_string( ContentSettingsTypeToGroupName(CONTENT_SETTINGS_TYPE_GEOLOCATION)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setExceptions", type_string, exceptions); // This is mainly here to keep this function ideologically parallel to @@ -516,7 +516,7 @@ void ContentSettingsHandler::UpdateGeolocationExceptionsView() { void ContentSettingsHandler::UpdateNotificationExceptionsView() { DesktopNotificationService* service = - dom_ui_->GetProfile()->GetDesktopNotificationService(); + web_ui_->GetProfile()->GetDesktopNotificationService(); std::vector<GURL> allowed(service->GetAllowedOrigins()); std::vector<GURL> blocked(service->GetBlockedOrigins()); @@ -533,7 +533,7 @@ void ContentSettingsHandler::UpdateNotificationExceptionsView() { StringValue type_string( ContentSettingsTypeToGroupName(CONTENT_SETTINGS_TYPE_NOTIFICATIONS)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setExceptions", type_string, exceptions); // This is mainly here to keep this function ideologically parallel to @@ -552,7 +552,7 @@ void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap( } StringValue type_string(ContentSettingsTypeToGroupName(type)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setExceptions", type_string, exceptions); UpdateExceptionsViewFromOTRHostContentSettingsMap(type); @@ -578,24 +578,24 @@ void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap( } StringValue type_string(ContentSettingsTypeToGroupName(type)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.setOTRExceptions", type_string, otr_exceptions); } void ContentSettingsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("setContentFilter", + web_ui_->RegisterMessageCallback("setContentFilter", NewCallback(this, &ContentSettingsHandler::SetContentFilter)); - dom_ui_->RegisterMessageCallback("setAllowThirdPartyCookies", + web_ui_->RegisterMessageCallback("setAllowThirdPartyCookies", NewCallback(this, &ContentSettingsHandler::SetAllowThirdPartyCookies)); - dom_ui_->RegisterMessageCallback("removeException", + web_ui_->RegisterMessageCallback("removeException", NewCallback(this, &ContentSettingsHandler::RemoveException)); - dom_ui_->RegisterMessageCallback("setException", + web_ui_->RegisterMessageCallback("setException", NewCallback(this, &ContentSettingsHandler::SetException)); - dom_ui_->RegisterMessageCallback("checkExceptionPatternValidity", + web_ui_->RegisterMessageCallback("checkExceptionPatternValidity", NewCallback(this, &ContentSettingsHandler::CheckExceptionPatternValidity)); } @@ -612,10 +612,10 @@ void ContentSettingsHandler::SetContentFilter(const ListValue* args) { ContentSetting default_setting = ContentSettingFromString(setting); ContentSettingsType content_type = ContentSettingsTypeFromGroupName(group); if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) { - dom_ui_->GetProfile()->GetGeolocationContentSettingsMap()-> + web_ui_->GetProfile()->GetGeolocationContentSettingsMap()-> SetDefaultContentSetting(default_setting); } else if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) { - dom_ui_->GetProfile()->GetDesktopNotificationService()-> + web_ui_->GetProfile()->GetDesktopNotificationService()-> SetDefaultContentSetting(default_setting); } else { GetContentSettingsMap()-> @@ -643,7 +643,7 @@ void ContentSettingsHandler::RemoveException(const ListValue* args) { rv = args->GetString(arg_i++, &embedding_origin); DCHECK(rv); - dom_ui_->GetProfile()->GetGeolocationContentSettingsMap()-> + web_ui_->GetProfile()->GetGeolocationContentSettingsMap()-> SetContentSetting(GURL(origin), GURL(embedding_origin), CONTENT_SETTING_DEFAULT); @@ -656,11 +656,11 @@ void ContentSettingsHandler::RemoveException(const ListValue* args) { DCHECK(rv); ContentSetting content_setting = ContentSettingFromString(setting); if (content_setting == CONTENT_SETTING_ALLOW) { - dom_ui_->GetProfile()->GetDesktopNotificationService()-> + web_ui_->GetProfile()->GetDesktopNotificationService()-> ResetAllowedOrigin(GURL(origin)); } else { DCHECK_EQ(content_setting, CONTENT_SETTING_BLOCK); - dom_ui_->GetProfile()->GetDesktopNotificationService()-> + web_ui_->GetProfile()->GetDesktopNotificationService()-> ResetBlockedOrigin(GURL(origin)); } } else { @@ -736,7 +736,7 @@ void ContentSettingsHandler::CheckExceptionPatternValidity( scoped_ptr<Value> pattern_value(Value::CreateStringValue(pattern_string)); scoped_ptr<Value> valid_value(Value::CreateBooleanValue(pattern.IsValid())); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ContentSettings.patternValidityCheckComplete", *type, *mode_value.get(), *pattern_value.get(), @@ -769,12 +769,12 @@ std::string ContentSettingsHandler::ContentSettingsTypeToGroupName( } HostContentSettingsMap* ContentSettingsHandler::GetContentSettingsMap() { - return dom_ui_->GetProfile()->GetHostContentSettingsMap(); + return web_ui_->GetProfile()->GetHostContentSettingsMap(); } HostContentSettingsMap* ContentSettingsHandler::GetOTRContentSettingsMap() { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); if (profile->HasOffTheRecordProfile()) return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); return NULL; diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc index 77b3540..edde6b6 100644 --- a/chrome/browser/dom_ui/options/cookies_view_handler.cc +++ b/chrome/browser/dom_ui/options/cookies_view_handler.cc @@ -269,13 +269,13 @@ void CookiesViewHandler::GetLocalizedValues( } void CookiesViewHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("updateCookieSearchResults", + web_ui_->RegisterMessageCallback("updateCookieSearchResults", NewCallback(this, &CookiesViewHandler::UpdateSearchResults)); - dom_ui_->RegisterMessageCallback("removeAllCookies", + web_ui_->RegisterMessageCallback("removeAllCookies", NewCallback(this, &CookiesViewHandler::RemoveAll)); - dom_ui_->RegisterMessageCallback("removeCookie", + web_ui_->RegisterMessageCallback("removeCookie", NewCallback(this, &CookiesViewHandler::Remove)); - dom_ui_->RegisterMessageCallback("loadCookie", + web_ui_->RegisterMessageCallback("loadCookie", NewCallback(this, &CookiesViewHandler::LoadChildren)); } @@ -296,7 +296,7 @@ void CookiesViewHandler::TreeNodesAdded(ui::TreeModel* model, Value::CreateStringValue(PointerToHexString(parent))); args.Append(Value::CreateIntegerValue(start)); args.Append(children); - dom_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemAdded", args); + web_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemAdded", args); } void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model, @@ -313,7 +313,7 @@ void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model, Value::CreateStringValue(PointerToHexString(parent))); args.Append(Value::CreateIntegerValue(start)); args.Append(Value::CreateIntegerValue(count)); - dom_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemRemoved", args); + web_ui_->CallJavascriptFunction(L"CookiesView.onTreeItemRemoved", args); } void CookiesViewHandler::TreeModelBeginBatch(CookiesTreeModel* model) { @@ -335,7 +335,7 @@ void CookiesViewHandler::UpdateSearchResults(const ListValue* args) { } if (!cookies_tree_model_.get()) { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); cookies_tree_model_.reset(new CookiesTreeModel( profile->GetRequestContext()->GetCookieStore()->GetCookieMonster(), new BrowsingDataDatabaseHelper(profile), @@ -409,5 +409,5 @@ void CookiesViewHandler::SendChildren(CookieTreeNode* parent) { Value::CreateStringValue(PointerToHexString(parent))); args.Append(children); - dom_ui_->CallJavascriptFunction(L"CookiesView.loadChildren", args); + web_ui_->CallJavascriptFunction(L"CookiesView.loadChildren", args); } diff --git a/chrome/browser/dom_ui/options/core_options_handler.cc b/chrome/browser/dom_ui/options/core_options_handler.cc index 6764b32..5a20e8b 100644 --- a/chrome/browser/dom_ui/options/core_options_handler.cc +++ b/chrome/browser/dom_ui/options/core_options_handler.cc @@ -91,8 +91,8 @@ void CoreOptionsHandler::Uninitialize() { WebUIMessageHandler* CoreOptionsHandler::Attach(WebUI* web_ui) { WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui); - DCHECK(dom_ui_); - registrar_.Init(dom_ui_->GetProfile()->GetPrefs()); + DCHECK(web_ui_); + registrar_.Init(web_ui_->GetProfile()->GetPrefs()); return result; } @@ -104,34 +104,34 @@ void CoreOptionsHandler::Observe(NotificationType type, } void CoreOptionsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("coreOptionsInitialize", + web_ui_->RegisterMessageCallback("coreOptionsInitialize", NewCallback(this, &CoreOptionsHandler::HandleInitialize)); - dom_ui_->RegisterMessageCallback("fetchPrefs", + web_ui_->RegisterMessageCallback("fetchPrefs", NewCallback(this, &CoreOptionsHandler::HandleFetchPrefs)); - dom_ui_->RegisterMessageCallback("observePrefs", + web_ui_->RegisterMessageCallback("observePrefs", NewCallback(this, &CoreOptionsHandler::HandleObservePrefs)); - dom_ui_->RegisterMessageCallback("setBooleanPref", + web_ui_->RegisterMessageCallback("setBooleanPref", NewCallback(this, &CoreOptionsHandler::HandleSetBooleanPref)); - dom_ui_->RegisterMessageCallback("setIntegerPref", + web_ui_->RegisterMessageCallback("setIntegerPref", NewCallback(this, &CoreOptionsHandler::HandleSetIntegerPref)); - dom_ui_->RegisterMessageCallback("setDoublePref", + web_ui_->RegisterMessageCallback("setDoublePref", NewCallback(this, &CoreOptionsHandler::HandleSetDoublePref)); - dom_ui_->RegisterMessageCallback("setStringPref", + web_ui_->RegisterMessageCallback("setStringPref", NewCallback(this, &CoreOptionsHandler::HandleSetStringPref)); - dom_ui_->RegisterMessageCallback("setListPref", + web_ui_->RegisterMessageCallback("setListPref", NewCallback(this, &CoreOptionsHandler::HandleSetListPref)); - dom_ui_->RegisterMessageCallback("clearPref", + web_ui_->RegisterMessageCallback("clearPref", NewCallback(this, &CoreOptionsHandler::HandleClearPref)); - dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", + web_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction)); } void CoreOptionsHandler::HandleInitialize(const ListValue* args) { - static_cast<OptionsUI*>(dom_ui_)->InitializeHandlers(); + static_cast<OptionsUI*>(web_ui_)->InitializeHandlers(); } Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) { - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); const PrefService::Preference* pref = pref_service->FindPreference(pref_name.c_str()); @@ -155,7 +155,7 @@ void CoreOptionsHandler::ObservePref(const std::string& pref_name) { void CoreOptionsHandler::SetPref(const std::string& pref_name, const Value* value, const std::string& metric) { - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); switch (value->GetType()) { case Value::TYPE_BOOLEAN: @@ -176,7 +176,7 @@ void CoreOptionsHandler::SetPref(const std::string& pref_name, void CoreOptionsHandler::ClearPref(const std::string& pref_name, const std::string& metric) { - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); pref_service->ClearPref(pref_name.c_str()); pref_service->ScheduleSavePersistentPrefs(); @@ -234,7 +234,7 @@ void CoreOptionsHandler::HandleFetchPrefs(const ListValue* args) { result_value.Set(pref_name.c_str(), FetchPref(pref_name)); } - dom_ui_->CallJavascriptFunction(UTF16ToWideHack(callback_function).c_str(), + web_ui_->CallJavascriptFunction(UTF16ToWideHack(callback_function).c_str(), result_value); } @@ -351,7 +351,7 @@ void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) { } void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) { - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); const PrefService::Preference* pref = pref_service->FindPreference(pref_name->c_str()); if (pref) { @@ -367,7 +367,7 @@ void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) { dict->SetBoolean("managed", pref->IsManaged()); result_value.Append(dict); - dom_ui_->CallJavascriptFunction(callback_function, result_value); + web_ui_->CallJavascriptFunction(callback_function, result_value); } } } diff --git a/chrome/browser/dom_ui/options/font_settings_handler.cc b/chrome/browser/dom_ui/options/font_settings_handler.cc index 4ee89b4..6942acd 100644 --- a/chrome/browser/dom_ui/options/font_settings_handler.cc +++ b/chrome/browser/dom_ui/options/font_settings_handler.cc @@ -131,8 +131,8 @@ WebUIMessageHandler* FontSettingsHandler::Attach(WebUI* web_ui) { WebUIMessageHandler* handler = OptionsPageUIHandler::Attach(web_ui); // Perform validation for saved fonts. - DCHECK(dom_ui_); - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + DCHECK(web_ui_); + PrefService* pref_service = web_ui_->GetProfile()->GetPrefs(); FontSettingsUtilities::ValidateSavedFonts(pref_service); // Register for preferences that we need to observe manually. @@ -165,24 +165,24 @@ void FontSettingsHandler::Observe(NotificationType type, } void FontSettingsHandler::SetupSerifFontSample() { - DCHECK(dom_ui_); + DCHECK(web_ui_); StringValue font_value(serif_font_.GetValue()); FundamentalValue size_value(default_font_size_.GetValue()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"FontSettings.setupSerifFontSample", font_value, size_value); } void FontSettingsHandler::SetupFixedFontSample() { - DCHECK(dom_ui_); + DCHECK(web_ui_); StringValue font_value(fixed_font_.GetValue()); FundamentalValue size_value(default_fixed_font_size_.GetValue()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"FontSettings.setupFixedFontSample", font_value, size_value); } void FontSettingsHandler::SetupMinimumFontSample() { - DCHECK(dom_ui_); + DCHECK(web_ui_); FundamentalValue size_value(minimum_font_size_.GetValue()); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"FontSettings.setupMinimumFontSample", size_value); } diff --git a/chrome/browser/dom_ui/options/import_data_handler.cc b/chrome/browser/dom_ui/options/import_data_handler.cc index 5e5c168..3931d09 100644 --- a/chrome/browser/dom_ui/options/import_data_handler.cc +++ b/chrome/browser/dom_ui/options/import_data_handler.cc @@ -63,7 +63,7 @@ void ImportDataHandler::Initialize() { } void ImportDataHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "importData", NewCallback(this, &ImportDataHandler::ImportData)); } @@ -98,7 +98,7 @@ void ImportDataHandler::ImportData(const ListValue* args) { uint16 import_services = (selected_items & supported_items); if (import_services) { FundamentalValue state(true); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"ImportDataOverlay.setImportingState", state); // TODO(csilv): Out-of-process import has only been qualified on MacOS X, @@ -111,7 +111,7 @@ void ImportDataHandler::ImportData(const ListValue* args) { importer_host_ = new ImporterHost; #endif importer_host_->SetObserver(this); - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); importer_host_->StartImportSettings(source_profile, profile, import_services, new ProfileWriter(profile), false); @@ -136,7 +136,7 @@ void ImportDataHandler::ImportEnded() { importer_host_->SetObserver(NULL); importer_host_ = NULL; - dom_ui_->CallJavascriptFunction(L"ImportDataOverlay.dismiss"); + web_ui_->CallJavascriptFunction(L"ImportDataOverlay.dismiss"); } void ImportDataHandler::SourceProfilesLoaded() { @@ -163,7 +163,7 @@ void ImportDataHandler::SourceProfilesLoaded() { browser_profiles.Append(browser_profile); } - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.ImportDataOverlay.updateSupportedBrowsers", browser_profiles); } diff --git a/chrome/browser/dom_ui/options/language_options_handler.cc b/chrome/browser/dom_ui/options/language_options_handler.cc index 9cfac87..f3119d5 100644 --- a/chrome/browser/dom_ui/options/language_options_handler.cc +++ b/chrome/browser/dom_ui/options/language_options_handler.cc @@ -42,7 +42,7 @@ void LanguageOptionsHandler::GetLocalizedValues( void LanguageOptionsHandler::RegisterMessages() { LanguageOptionsHandlerCommon::RegisterMessages(); - dom_ui_->RegisterMessageCallback("uiLanguageRestart", + web_ui_->RegisterMessageCallback("uiLanguageRestart", NewCallback(this, &LanguageOptionsHandler::RestartCallback)); } diff --git a/chrome/browser/dom_ui/options/language_options_handler_common.cc b/chrome/browser/dom_ui/options/language_options_handler_common.cc index 46260a1..3d5a7f4 100644 --- a/chrome/browser/dom_ui/options/language_options_handler_common.cc +++ b/chrome/browser/dom_ui/options/language_options_handler_common.cc @@ -102,16 +102,16 @@ void LanguageOptionsHandlerCommon::GetLocalizedValues( } void LanguageOptionsHandlerCommon::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("languageOptionsOpen", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("languageOptionsOpen", NewCallback( this, &LanguageOptionsHandlerCommon::LanguageOptionsOpenCallback)); - dom_ui_->RegisterMessageCallback("spellCheckLanguageChange", + web_ui_->RegisterMessageCallback("spellCheckLanguageChange", NewCallback( this, &LanguageOptionsHandlerCommon::SpellCheckLanguageChangeCallback)); - dom_ui_->RegisterMessageCallback("uiLanguageChange", + web_ui_->RegisterMessageCallback("uiLanguageChange", NewCallback( this, &LanguageOptionsHandlerCommon::UiLanguageChangeCallback)); @@ -150,7 +150,7 @@ void LanguageOptionsHandlerCommon::UiLanguageChangeCallback( "LanguageOptions_UiLanguageChange_%s", language_code.c_str()); UserMetrics::RecordComputedAction(action); SetApplicationLocale(language_code); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.LanguageOptions.uiLanguageSaved"); } diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 1498c73..e4565e6 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -126,7 +126,7 @@ bool OptionsPageUIHandler::IsEnabled() { void OptionsPageUIHandler::UserMetricsRecordAction( const UserMetricsAction& action) { - UserMetrics::RecordAction(action, dom_ui_->GetProfile()); + UserMetrics::RecordAction(action, web_ui_->GetProfile()); } // static diff --git a/chrome/browser/dom_ui/options/password_manager_handler.cc b/chrome/browser/dom_ui/options/password_manager_handler.cc index 7ec1d3c..f14643f 100644 --- a/chrome/browser/dom_ui/options/password_manager_handler.cc +++ b/chrome/browser/dom_ui/options/password_manager_handler.cc @@ -57,31 +57,31 @@ void PasswordManagerHandler::GetLocalizedValues( } void PasswordManagerHandler::Initialize() { - // We should not cache dom_ui_->GetProfile(). See crosbug.com/6304. + // We should not cache web_ui_->GetProfile(). See crosbug.com/6304. } void PasswordManagerHandler::RegisterMessages() { - DCHECK(dom_ui_); + DCHECK(web_ui_); - dom_ui_->RegisterMessageCallback("updatePasswordLists", + web_ui_->RegisterMessageCallback("updatePasswordLists", NewCallback(this, &PasswordManagerHandler::UpdatePasswordLists)); - dom_ui_->RegisterMessageCallback("removeSavedPassword", + web_ui_->RegisterMessageCallback("removeSavedPassword", NewCallback(this, &PasswordManagerHandler::RemoveSavedPassword)); - dom_ui_->RegisterMessageCallback("removePasswordException", + web_ui_->RegisterMessageCallback("removePasswordException", NewCallback(this, &PasswordManagerHandler::RemovePasswordException)); - dom_ui_->RegisterMessageCallback("removeAllSavedPasswords", + web_ui_->RegisterMessageCallback("removeAllSavedPasswords", NewCallback(this, &PasswordManagerHandler::RemoveAllSavedPasswords)); - dom_ui_->RegisterMessageCallback("removeAllPasswordExceptions", NewCallback( + web_ui_->RegisterMessageCallback("removeAllPasswordExceptions", NewCallback( this, &PasswordManagerHandler::RemoveAllPasswordExceptions)); } PasswordStore* PasswordManagerHandler::GetPasswordStore() { - return dom_ui_->GetProfile()->GetPasswordStore(Profile::EXPLICIT_ACCESS); + return web_ui_->GetProfile()->GetPasswordStore(Profile::EXPLICIT_ACCESS); } void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) { languages_ = - dom_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages); + web_ui_->GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages); populater_.Populate(); exception_populater_.Populate(); } @@ -138,7 +138,7 @@ void PasswordManagerHandler::SetPasswordList() { entries.Append(entry); } - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"PasswordManager.setSavedPasswordsList", entries); } @@ -149,7 +149,7 @@ void PasswordManagerHandler::SetPasswordExceptionList() { net::FormatUrl(password_exception_list_[i]->origin, languages_))); } - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"PasswordManager.setPasswordExceptionsList", entries); } diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index 5ba415c..37966fb 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -48,7 +48,7 @@ PersonalOptionsHandler::PersonalOptionsHandler() { PersonalOptionsHandler::~PersonalOptionsHandler() { ProfileSyncService* sync_service = - dom_ui_->GetProfile()->GetProfileSyncService(); + web_ui_->GetProfile()->GetProfileSyncService(); if (sync_service) sync_service->RemoveObserver(this); } @@ -166,28 +166,28 @@ void PersonalOptionsHandler::GetLocalizedValues( } void PersonalOptionsHandler::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback( + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback( "showSyncActionDialog", NewCallback(this, &PersonalOptionsHandler::ShowSyncActionDialog)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "showSyncLoginDialog", NewCallback(this, &PersonalOptionsHandler::ShowSyncLoginDialog)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "showCustomizeSyncDialog", NewCallback(this, &PersonalOptionsHandler::ShowCustomizeSyncDialog)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "themesReset", NewCallback(this, &PersonalOptionsHandler::ThemesReset)); #if defined(TOOLKIT_GTK) - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "themesSetGTK", NewCallback(this, &PersonalOptionsHandler::ThemesSetGTK)); #endif - dom_ui_->RegisterMessageCallback("updatePreferredDataTypes", + web_ui_->RegisterMessageCallback("updatePreferredDataTypes", NewCallback(this, &PersonalOptionsHandler::OnPreferredDataTypesUpdated)); #if defined(OS_CHROMEOS) - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "loadAccountPicture", NewCallback(this, &PersonalOptionsHandler::LoadAccountPicture)); #endif @@ -205,7 +205,7 @@ void PersonalOptionsHandler::Observe(NotificationType type, void PersonalOptionsHandler::OnStateChanged() { string16 status_label; string16 link_label; - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); DCHECK(service); bool managed = service->IsManaged(); bool sync_setup_completed = service->HasSyncSetupCompleted(); @@ -237,37 +237,37 @@ void PersonalOptionsHandler::OnStateChanged() { } scoped_ptr<Value> completed(Value::CreateBooleanValue(sync_setup_completed)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncSetupCompleted", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncSetupCompleted", *completed); scoped_ptr<Value> label(Value::CreateStringValue(status_label)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncStatus", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncStatus", *label); scoped_ptr<Value> enabled( Value::CreateBooleanValue(is_start_stop_button_enabled)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonEnabled", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonEnabled", *enabled); scoped_ptr<Value> visible( Value::CreateBooleanValue(is_start_stop_button_visible)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonVisible", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonVisible", *visible); label.reset(Value::CreateStringValue(start_stop_button_label)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonLabel", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setStartStopButtonLabel", *label); label.reset(Value::CreateStringValue(link_label)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkLabel", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkLabel", *label); enabled.reset(Value::CreateBooleanValue(!managed)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkEnabled", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkEnabled", *enabled); visible.reset(Value::CreateBooleanValue(status_has_error)); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"PersonalOptions.setSyncStatusErrorVisible", *visible); } @@ -281,12 +281,12 @@ void PersonalOptionsHandler::OnLoginFailure( } void PersonalOptionsHandler::ObserveThemeChanged() { - Profile* profile = dom_ui_->GetProfile(); + Profile* profile = web_ui_->GetProfile(); #if defined(TOOLKIT_GTK) GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile); bool is_gtk_theme = provider->UseGtkTheme(); FundamentalValue gtk_enabled(!is_gtk_theme); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled); #else BrowserThemeProvider* provider = @@ -296,13 +296,13 @@ void PersonalOptionsHandler::ObserveThemeChanged() { bool is_classic_theme = !is_gtk_theme && provider->GetThemeID().empty(); FundamentalValue enabled(!is_classic_theme); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"options.PersonalOptions.setThemesResetButtonEnabled", enabled); } void PersonalOptionsHandler::Initialize() { banner_handler_.reset( - new OptionsManagedBannerHandler(dom_ui_, + new OptionsManagedBannerHandler(web_ui_, ASCIIToUTF16("PersonalOptions"), OPTIONS_PAGE_CONTENT)); @@ -312,7 +312,7 @@ void PersonalOptionsHandler::Initialize() { ObserveThemeChanged(); ProfileSyncService* sync_service = - dom_ui_->GetProfile()->GetProfileSyncService(); + web_ui_->GetProfile()->GetProfileSyncService(); if (sync_service) { sync_service->AddObserver(this); OnStateChanged(); @@ -320,15 +320,15 @@ void PersonalOptionsHandler::Initialize() { DictionaryValue args; SyncSetupFlow::GetArgsForConfigure(sync_service, &args); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"PersonalOptions.setRegisteredDataTypes", args); } else { - dom_ui_->CallJavascriptFunction(L"options.PersonalOptions.hideSyncSection"); + web_ui_->CallJavascriptFunction(L"options.PersonalOptions.hideSyncSection"); } } void PersonalOptionsHandler::ShowSyncActionDialog(const ListValue* args) { - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); DCHECK(service); service->ShowErrorUI(NULL); } @@ -339,10 +339,10 @@ void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) { string16 message = l10n_util::GetStringFUTF16( IDS_SYNC_LOGIN_INTRODUCTION, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); - dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin( - dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this); + web_ui_->GetProfile()->GetBrowserSignin()->RequestSignin( + web_ui_->tab_contents(), UTF8ToUTF16(email), message, this); #else - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); DCHECK(service); service->ShowLoginDialog(NULL); ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS); @@ -350,20 +350,20 @@ void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) { } void PersonalOptionsHandler::ShowCustomizeSyncDialog(const ListValue* args) { - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); DCHECK(service); service->ShowConfigure(NULL); } void PersonalOptionsHandler::ThemesReset(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_ThemesReset")); - dom_ui_->GetProfile()->ClearTheme(); + web_ui_->GetProfile()->ClearTheme(); } #if defined(TOOLKIT_GTK) void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) { UserMetricsRecordAction(UserMetricsAction("Options_GtkThemeSet")); - dom_ui_->GetProfile()->SetNativeTheme(); + web_ui_->GetProfile()->SetNativeTheme(); } #endif @@ -371,7 +371,7 @@ void PersonalOptionsHandler::OnPreferredDataTypesUpdated( const ListValue* args) { NotificationService::current()->Notify( NotificationType::SYNC_DATA_TYPES_UPDATED, - Source<Profile>(dom_ui_->GetProfile()), + Source<Profile>(web_ui_->GetProfile()), NotificationService::NoDetails()); } @@ -382,7 +382,7 @@ void PersonalOptionsHandler::LoadAccountPicture(const ListValue* args) { if (!account_picture.isNull()) { StringValue data_url(web_ui_util::GetImageDataUrl(account_picture)); - dom_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture", + web_ui_->CallJavascriptFunction(L"PersonalOptions.setAccountPicture", data_url); } } diff --git a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc index 92070ad..607ce46 100644 --- a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc +++ b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc @@ -37,7 +37,7 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() { } void SearchEngineManagerHandler::Initialize() { - list_controller_.reset(new KeywordEditorController(dom_ui_->GetProfile())); + list_controller_.reset(new KeywordEditorController(web_ui_->GetProfile())); if (list_controller_.get()) { list_controller_->table_model()->SetObserver(this); OnModelChanged(); @@ -77,23 +77,23 @@ void SearchEngineManagerHandler::GetLocalizedValues( } void SearchEngineManagerHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "managerSetDefaultSearchEngine", NewCallback(this, &SearchEngineManagerHandler::SetDefaultSearchEngine)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "removeSearchEngine", NewCallback(this, &SearchEngineManagerHandler::RemoveSearchEngine)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "editSearchEngine", NewCallback(this, &SearchEngineManagerHandler::EditSearchEngine)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "checkSearchEngineInfoValidity", NewCallback(this, &SearchEngineManagerHandler::CheckSearchEngineInfoValidity)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "searchEngineEditCancelled", NewCallback(this, &SearchEngineManagerHandler::EditCancelled)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "searchEngineEditCompleted", NewCallback(this, &SearchEngineManagerHandler::EditCompleted)); } @@ -125,7 +125,7 @@ void SearchEngineManagerHandler::OnModelChanged() { others_list.Append(CreateDictionaryForEngine(i, i == default_index)); } - dom_ui_->CallJavascriptFunction(L"SearchEngineManager.updateSearchEngineList", + web_ui_->CallJavascriptFunction(L"SearchEngineManager.updateSearchEngineList", defaults_list, others_list); } @@ -207,7 +207,7 @@ void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) { if (index != -1) edit_url = list_controller_->GetTemplateURL(index); edit_controller_.reset( - new EditSearchEngineController(edit_url, this, dom_ui_->GetProfile())); + new EditSearchEngineController(edit_url, this, web_ui_->GetProfile())); } void SearchEngineManagerHandler::OnEditedKeyword( @@ -245,7 +245,7 @@ void SearchEngineManagerHandler::CheckSearchEngineInfoValidity( validity.SetBoolean("keyword", edit_controller_->IsKeywordValid(keyword)); validity.SetBoolean("url", edit_controller_->IsURLValid(url)); StringValue indexValue(modelIndex); - dom_ui_->CallJavascriptFunction( + web_ui_->CallJavascriptFunction( L"SearchEngineManager.validityCheckCallback", validity, indexValue); } diff --git a/chrome/browser/dom_ui/options/stop_syncing_handler.cc b/chrome/browser/dom_ui/options/stop_syncing_handler.cc index 13e8f2b..9c0c579 100644 --- a/chrome/browser/dom_ui/options/stop_syncing_handler.cc +++ b/chrome/browser/dom_ui/options/stop_syncing_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. @@ -32,13 +32,13 @@ void StopSyncingHandler::GetLocalizedValues( } void StopSyncingHandler::RegisterMessages() { - DCHECK(dom_ui_); - dom_ui_->RegisterMessageCallback("stopSyncing", + DCHECK(web_ui_); + web_ui_->RegisterMessageCallback("stopSyncing", NewCallback(this, &StopSyncingHandler::StopSyncing)); } void StopSyncingHandler::StopSyncing(const ListValue* args){ - ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); + ProfileSyncService* service = web_ui_->GetProfile()->GetProfileSyncService(); if (service != NULL && ProfileSyncService::IsSyncEnabled()) { service->DisableForUser(); ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS); diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index 0a2ae86..e895ff9 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -208,15 +208,15 @@ WebUIMessageHandler* PluginsDOMHandler::Attach(WebUI* web_ui) { } void PluginsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("requestPluginsData", + web_ui_->RegisterMessageCallback("requestPluginsData", NewCallback(this, &PluginsDOMHandler::HandleRequestPluginsData)); - dom_ui_->RegisterMessageCallback("enablePlugin", + web_ui_->RegisterMessageCallback("enablePlugin", NewCallback(this, &PluginsDOMHandler::HandleEnablePluginMessage)); - dom_ui_->RegisterMessageCallback("showTermsOfService", + web_ui_->RegisterMessageCallback("showTermsOfService", NewCallback(this, &PluginsDOMHandler::HandleShowTermsOfServiceMessage)); - dom_ui_->RegisterMessageCallback("saveShowDetailsToPrefs", + web_ui_->RegisterMessageCallback("saveShowDetailsToPrefs", NewCallback(this, &PluginsDOMHandler::HandleSaveShowDetailsToPrefs)); - dom_ui_->RegisterMessageCallback("getShowDetails", + web_ui_->RegisterMessageCallback("getShowDetails", NewCallback(this, &PluginsDOMHandler::HandleGetShowDetails)); } @@ -265,12 +265,12 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) { // TODO(viettrungluu): We might also want to ensure that the plugins // list is always written to prefs even when the user hasn't disabled a // plugin. <http://crbug.com/39101> - plugin_updater->UpdatePreferences(dom_ui_->GetProfile(), 0); + plugin_updater->UpdatePreferences(web_ui_->GetProfile(), 0); } void PluginsDOMHandler::HandleShowTermsOfServiceMessage(const ListValue* args) { // Show it in a new browser window.... - Browser* browser = Browser::Create(dom_ui_->GetProfile()); + Browser* browser = Browser::Create(web_ui_->GetProfile()); browser->OpenURL(GURL(chrome::kAboutTermsURL), GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); browser->window()->Show(); @@ -287,7 +287,7 @@ void PluginsDOMHandler::HandleSaveShowDetailsToPrefs(const ListValue* args) { void PluginsDOMHandler::HandleGetShowDetails(const ListValue* args) { FundamentalValue show_details(show_details_.GetValue()); - dom_ui_->CallJavascriptFunction(L"loadShowDetailsFromPrefs", show_details); + web_ui_->CallJavascriptFunction(L"loadShowDetailsFromPrefs", show_details); } void PluginsDOMHandler::Observe(NotificationType type, @@ -332,7 +332,7 @@ void PluginsDOMHandler::PluginsLoaded(ListWrapper* wrapper) { DictionaryValue results; results.Set("plugins", wrapper->list); wrapper->list = NULL; // So it doesn't get deleted. - dom_ui_->CallJavascriptFunction(L"returnPluginsData", results); + web_ui_->CallJavascriptFunction(L"returnPluginsData", results); } } // namespace diff --git a/chrome/browser/dom_ui/print_preview_handler.cc b/chrome/browser/dom_ui/print_preview_handler.cc index 7db9923..80e53fb 100644 --- a/chrome/browser/dom_ui/print_preview_handler.cc +++ b/chrome/browser/dom_ui/print_preview_handler.cc @@ -15,7 +15,7 @@ PrintPreviewHandler::~PrintPreviewHandler() { } void PrintPreviewHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getPrinters", + web_ui_->RegisterMessageCallback("getPrinters", NewCallback(this, &PrintPreviewHandler::HandleGetPrinters)); } @@ -29,5 +29,5 @@ void PrintPreviewHandler::HandleGetPrinters(const ListValue*) { printers.Append(new StringValue(index->printer_name)); } - dom_ui_->CallJavascriptFunction(L"setPrinters", printers); + web_ui_->CallJavascriptFunction(L"setPrinters", printers); } diff --git a/chrome/browser/dom_ui/settings_browsertest.cc b/chrome/browser/dom_ui/settings_browsertest.cc index 0a6c663..9f63ada 100644 --- a/chrome/browser/dom_ui/settings_browsertest.cc +++ b/chrome/browser/dom_ui/settings_browsertest.cc @@ -41,25 +41,25 @@ class MockCoreOptionsHandler : public CoreOptionsHandler { void(const ListValue* args)); virtual void RegisterMessages() { - dom_ui_->RegisterMessageCallback("coreOptionsInitialize", + web_ui_->RegisterMessageCallback("coreOptionsInitialize", NewCallback(this, &MockCoreOptionsHandler ::HandleInitialize)); - dom_ui_->RegisterMessageCallback("fetchPrefs", + web_ui_->RegisterMessageCallback("fetchPrefs", NewCallback(this, &MockCoreOptionsHandler ::HandleFetchPrefs)); - dom_ui_->RegisterMessageCallback("observePrefs", + web_ui_->RegisterMessageCallback("observePrefs", NewCallback(this, &MockCoreOptionsHandler ::HandleObservePrefs)); - dom_ui_->RegisterMessageCallback("setBooleanPref", + web_ui_->RegisterMessageCallback("setBooleanPref", NewCallback(this, &MockCoreOptionsHandler ::HandleSetBooleanPref)); - dom_ui_->RegisterMessageCallback("setIntegerPref", + web_ui_->RegisterMessageCallback("setIntegerPref", NewCallback(this, &MockCoreOptionsHandler ::HandleSetIntegerPref)); - dom_ui_->RegisterMessageCallback("setDoublePref", + web_ui_->RegisterMessageCallback("setDoublePref", NewCallback(this, &MockCoreOptionsHandler ::HandleSetDoublePref)); - dom_ui_->RegisterMessageCallback("setStringPref", + web_ui_->RegisterMessageCallback("setStringPref", NewCallback(this, &MockCoreOptionsHandler ::HandleSetStringPref)); - dom_ui_->RegisterMessageCallback("setObjectPref", + web_ui_->RegisterMessageCallback("setObjectPref", NewCallback(this, &MockCoreOptionsHandler ::HandleSetObjectPref)); - dom_ui_->RegisterMessageCallback("clearPref", + web_ui_->RegisterMessageCallback("clearPref", NewCallback(this, &MockCoreOptionsHandler ::HandleClearPref)); - dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", + web_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", NewCallback(this, &MockCoreOptionsHandler ::HandleUserMetricsAction)); } }; diff --git a/chrome/browser/dom_ui/shown_sections_handler.cc b/chrome/browser/dom_ui/shown_sections_handler.cc index 8df69fb..96afe93 100644 --- a/chrome/browser/dom_ui/shown_sections_handler.cc +++ b/chrome/browser/dom_ui/shown_sections_handler.cc @@ -64,9 +64,9 @@ ShownSectionsHandler::ShownSectionsHandler(PrefService* pref_service) } void ShownSectionsHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getShownSections", + web_ui_->RegisterMessageCallback("getShownSections", NewCallback(this, &ShownSectionsHandler::HandleGetShownSections)); - dom_ui_->RegisterMessageCallback("setShownSections", + web_ui_->RegisterMessageCallback("setShownSections", NewCallback(this, &ShownSectionsHandler::HandleSetShownSections)); } @@ -78,7 +78,7 @@ void ShownSectionsHandler::Observe(NotificationType type, DCHECK(*pref_name == prefs::kNTPShownSections); int sections = pref_service_->GetInteger(prefs::kNTPShownSections); FundamentalValue sections_value(sections); - dom_ui_->CallJavascriptFunction(L"setShownSections", sections_value); + web_ui_->CallJavascriptFunction(L"setShownSections", sections_value); } else { NOTREACHED(); } @@ -87,7 +87,7 @@ void ShownSectionsHandler::Observe(NotificationType type, void ShownSectionsHandler::HandleGetShownSections(const ListValue* args) { int sections = GetShownSections(pref_service_); FundamentalValue sections_value(sections); - dom_ui_->CallJavascriptFunction(L"onShownSections", sections_value); + web_ui_->CallJavascriptFunction(L"onShownSections", sections_value); } void ShownSectionsHandler::HandleSetShownSections(const ListValue* args) { @@ -97,7 +97,7 @@ void ShownSectionsHandler::HandleSetShownSections(const ListValue* args) { int old_mode = pref_service_->GetInteger(prefs::kNTPShownSections); if (old_mode != mode) { - NotifySectionDisabled(mode, old_mode, dom_ui_->GetProfile()); + NotifySectionDisabled(mode, old_mode, web_ui_->GetProfile()); pref_service_->SetInteger(prefs::kNTPShownSections, mode); } } diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc index 4693e0c..5552e6a 100644 --- a/chrome/browser/dom_ui/slideshow_ui.cc +++ b/chrome/browser/dom_ui/slideshow_ui.cc @@ -159,9 +159,9 @@ void SlideshowHandler::Init() { } void SlideshowHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("getChildren", + web_ui_->RegisterMessageCallback("getChildren", NewCallback(this, &SlideshowHandler::HandleGetChildren)); - dom_ui_->RegisterMessageCallback("refreshDirectory", + web_ui_->RegisterMessageCallback("refreshDirectory", NewCallback(this, &SlideshowHandler::HandleRefreshDirectory)); } @@ -263,7 +263,7 @@ void SlideshowHandler::OnListDone(int error) { info_value.SetString("functionCall", "getChildren"); } info_value.SetString(kPropertyPath, currentpath_.value()); - dom_ui_->CallJavascriptFunction(L"browseFileResult", + web_ui_->CallJavascriptFunction(L"browseFileResult", info_value, *(filelist_value_.get())); } diff --git a/chrome/browser/dom_ui/textfields_ui.cc b/chrome/browser/dom_ui/textfields_ui.cc index a0aabcd..7d8891d 100644 --- a/chrome/browser/dom_ui/textfields_ui.cc +++ b/chrome/browser/dom_ui/textfields_ui.cc @@ -51,12 +51,12 @@ TextfieldsUIHTMLSource::~TextfieldsUIHTMLSource() {} TextfieldsDOMHandler::TextfieldsDOMHandler() : WebUIMessageHandler() {} void TextfieldsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("textfieldValue", + web_ui_->RegisterMessageCallback("textfieldValue", NewCallback(this, &TextfieldsDOMHandler::HandleTextfieldValue)); } void TextfieldsDOMHandler::HandleTextfieldValue(const ListValue* args) { - static_cast<TextfieldsUI*>(dom_ui_)->set_text(ExtractStringValue(args)); + static_cast<TextfieldsUI*>(web_ui_)->set_text(ExtractStringValue(args)); } /** diff --git a/chrome/browser/dom_ui/web_ui.cc b/chrome/browser/dom_ui/web_ui.cc index 62c0a45..1721c04 100644 --- a/chrome/browser/dom_ui/web_ui.cc +++ b/chrome/browser/dom_ui/web_ui.cc @@ -158,14 +158,14 @@ void WebUI::ExecuteJavascript(const std::wstring& javascript) { /////////////////////////////////////////////////////////////////////////////// // WebUIMessageHandler -WebUIMessageHandler::WebUIMessageHandler() : dom_ui_(NULL) { +WebUIMessageHandler::WebUIMessageHandler() : web_ui_(NULL) { } WebUIMessageHandler::~WebUIMessageHandler() { } -WebUIMessageHandler* WebUIMessageHandler::Attach(WebUI* dom_ui) { - dom_ui_ = dom_ui; +WebUIMessageHandler* WebUIMessageHandler::Attach(WebUI* web_ui) { + web_ui_ = web_ui; RegisterMessages(); return this; } diff --git a/chrome/browser/dom_ui/web_ui.h b/chrome/browser/dom_ui/web_ui.h index aa95eda..1e680fc 100644 --- a/chrome/browser/dom_ui/web_ui.h +++ b/chrome/browser/dom_ui/web_ui.h @@ -212,7 +212,7 @@ class WebUIMessageHandler { // Extract a string value from a list Value. std::wstring ExtractStringValue(const ListValue* value); - WebUI* dom_ui_; // TODO(tfarina): Rename the variable to web_ui_. + WebUI* web_ui_; private: DISALLOW_COPY_AND_ASSIGN(WebUIMessageHandler); diff --git a/chrome/browser/dom_ui/web_ui_handler_browsertest.cc b/chrome/browser/dom_ui/web_ui_handler_browsertest.cc index 126cad9..de15805 100644 --- a/chrome/browser/dom_ui/web_ui_handler_browsertest.cc +++ b/chrome/browser/dom_ui/web_ui_handler_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/test/ui_test_utils.h" bool WebUIHandlerBrowserTest::Execute(const std::string& js_test) { - dom_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame( + web_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame( string16(), UTF8ToUTF16(js_test)); return WaitForResult(); } @@ -27,9 +27,9 @@ void WebUIHandlerBrowserTest::HandleFail(const ListValue* args) { } void WebUIHandlerBrowserTest::RegisterMessages() { - dom_ui_->RegisterMessageCallback("Pass", + web_ui_->RegisterMessageCallback("Pass", NewCallback(this, &WebUIHandlerBrowserTest::HandlePass)); - dom_ui_->RegisterMessageCallback("Fail", + web_ui_->RegisterMessageCallback("Fail", NewCallback(this, &WebUIHandlerBrowserTest::HandleFail)); } diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 1149e7d..157eacb 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -300,33 +300,33 @@ ExtensionsDOMHandler::ExtensionsDOMHandler(ExtensionService* extension_service) } void ExtensionsDOMHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("requestExtensionsData", + web_ui_->RegisterMessageCallback("requestExtensionsData", NewCallback(this, &ExtensionsDOMHandler::HandleRequestExtensionsData)); - dom_ui_->RegisterMessageCallback("toggleDeveloperMode", + web_ui_->RegisterMessageCallback("toggleDeveloperMode", NewCallback(this, &ExtensionsDOMHandler::HandleToggleDeveloperMode)); - dom_ui_->RegisterMessageCallback("inspect", + web_ui_->RegisterMessageCallback("inspect", NewCallback(this, &ExtensionsDOMHandler::HandleInspectMessage)); - dom_ui_->RegisterMessageCallback("reload", + web_ui_->RegisterMessageCallback("reload", NewCallback(this, &ExtensionsDOMHandler::HandleReloadMessage)); - dom_ui_->RegisterMessageCallback("enable", + web_ui_->RegisterMessageCallback("enable", NewCallback(this, &ExtensionsDOMHandler::HandleEnableMessage)); - dom_ui_->RegisterMessageCallback("enableIncognito", + web_ui_->RegisterMessageCallback("enableIncognito", NewCallback(this, &ExtensionsDOMHandler::HandleEnableIncognitoMessage)); - dom_ui_->RegisterMessageCallback("allowFileAccess", + web_ui_->RegisterMessageCallback("allowFileAccess", NewCallback(this, &ExtensionsDOMHandler::HandleAllowFileAccessMessage)); - dom_ui_->RegisterMessageCallback("uninstall", + web_ui_->RegisterMessageCallback("uninstall", NewCallback(this, &ExtensionsDOMHandler::HandleUninstallMessage)); - dom_ui_->RegisterMessageCallback("options", + web_ui_->RegisterMessageCallback("options", NewCallback(this, &ExtensionsDOMHandler::HandleOptionsMessage)); - dom_ui_->RegisterMessageCallback("showButton", + web_ui_->RegisterMessageCallback("showButton", NewCallback(this, &ExtensionsDOMHandler::HandleShowButtonMessage)); - dom_ui_->RegisterMessageCallback("load", + web_ui_->RegisterMessageCallback("load", NewCallback(this, &ExtensionsDOMHandler::HandleLoadMessage)); - dom_ui_->RegisterMessageCallback("pack", + web_ui_->RegisterMessageCallback("pack", NewCallback(this, &ExtensionsDOMHandler::HandlePackMessage)); - dom_ui_->RegisterMessageCallback("autoupdate", + web_ui_->RegisterMessageCallback("autoupdate", NewCallback(this, &ExtensionsDOMHandler::HandleAutoUpdateMessage)); - dom_ui_->RegisterMessageCallback("selectFilePath", + web_ui_->RegisterMessageCallback("selectFilePath", NewCallback(this, &ExtensionsDOMHandler::HandleSelectFilePathMessage)); } @@ -381,7 +381,7 @@ void ExtensionsDOMHandler::HandleRequestExtensionsData(const ListValue* args) { } results->Set("extensions", extensions_list); - bool developer_mode = dom_ui_->GetProfile()->GetPrefs() + bool developer_mode = web_ui_->GetProfile()->GetPrefs() ->GetBoolean(prefs::kExtensionsUIDeveloperMode); results->SetBoolean("developerMode", developer_mode); @@ -393,7 +393,7 @@ void ExtensionsDOMHandler::HandleRequestExtensionsData(const ListValue* args) { } void ExtensionsDOMHandler::OnIconsLoaded(DictionaryValue* json) { - dom_ui_->CallJavascriptFunction(L"returnExtensionsData", *json); + web_ui_->CallJavascriptFunction(L"returnExtensionsData", *json); delete json; // Register for notifications that we need to reload the page. @@ -436,14 +436,14 @@ ExtensionResource ExtensionsDOMHandler::PickExtensionIcon( ExtensionInstallUI* ExtensionsDOMHandler::GetExtensionInstallUI() { if (!install_ui_.get()) - install_ui_.reset(new ExtensionInstallUI(dom_ui_->GetProfile())); + install_ui_.reset(new ExtensionInstallUI(web_ui_->GetProfile())); return install_ui_.get(); } void ExtensionsDOMHandler::HandleToggleDeveloperMode(const ListValue* args) { - bool developer_mode = dom_ui_->GetProfile()->GetPrefs() + bool developer_mode = web_ui_->GetProfile()->GetPrefs() ->GetBoolean(prefs::kExtensionsUIDeveloperMode); - dom_ui_->GetProfile()->GetPrefs()->SetBoolean( + web_ui_->GetProfile()->GetPrefs()->SetBoolean( prefs::kExtensionsUIDeveloperMode, !developer_mode); } @@ -484,7 +484,7 @@ void ExtensionsDOMHandler::HandleEnableMessage(const ListValue* args) { const Extension* extension = extensions_service_->GetExtensionById(extension_id, true); ShowExtensionDisabledDialog(extensions_service_, - dom_ui_->GetProfile(), extension); + web_ui_->GetProfile(), extension); } else { extensions_service_->EnableExtension(extension_id); } @@ -567,7 +567,7 @@ void ExtensionsDOMHandler::HandleOptionsMessage(const ListValue* args) { const Extension* extension = GetExtension(args); if (!extension || extension->options_url().is_empty()) return; - dom_ui_->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage( + web_ui_->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage( extension, NULL); } @@ -586,7 +586,7 @@ void ExtensionsDOMHandler::HandleLoadMessage(const ListValue* args) { void ExtensionsDOMHandler::ShowAlert(const std::string& message) { ListValue arguments; arguments.Append(Value::CreateStringValue(message)); - dom_ui_->CallJavascriptFunction(L"alert", arguments); + web_ui_->CallJavascriptFunction(L"alert", arguments); } void ExtensionsDOMHandler::HandlePackMessage(const ListValue* args) { @@ -628,7 +628,7 @@ void ExtensionsDOMHandler::OnPackSuccess(const FilePath& crx_file, pem_file))); ListValue results; - dom_ui_->CallJavascriptFunction(L"hidePackDialog", results); + web_ui_->CallJavascriptFunction(L"hidePackDialog", results); } void ExtensionsDOMHandler::OnPackFailure(const std::string& error) { @@ -678,7 +678,7 @@ void ExtensionsDOMHandler::HandleSelectFilePathMessage(const ListValue* args) { load_extension_dialog_ = SelectFileDialog::Create(this); load_extension_dialog_->SelectFile(type, select_title, FilePath(), &info, file_type_index, FILE_PATH_LITERAL(""), - dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); + web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(), NULL); } @@ -687,7 +687,7 @@ void ExtensionsDOMHandler::FileSelected(const FilePath& path, int index, // Add the extensions to the results structure. ListValue results; results.Append(Value::CreateStringValue(path.value())); - dom_ui_->CallJavascriptFunction(L"window.handleFilePathSelected", results); + web_ui_->CallJavascriptFunction(L"window.handleFilePathSelected", results); } void ExtensionsDOMHandler::MultiFilesSelected( @@ -742,7 +742,7 @@ const Extension* ExtensionsDOMHandler::GetExtension(const ListValue* args) { } void ExtensionsDOMHandler::MaybeUpdateAfterNotification() { - if (!ignore_notifications_ && dom_ui_->tab_contents()) + if (!ignore_notifications_ && web_ui_->tab_contents()) HandleRequestExtensionsData(NULL); deleting_rvh_ = NULL; } diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc index dcd7742..fb933e7 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_message_handler.cc @@ -17,11 +17,11 @@ WebUIMessageHandler* CloudPrintSetupMessageHandler::Attach(WebUI* web_ui) { } void CloudPrintSetupMessageHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("SubmitAuth", + web_ui_->RegisterMessageCallback("SubmitAuth", NewCallback(this, &CloudPrintSetupMessageHandler::HandleSubmitAuth)); - dom_ui_->RegisterMessageCallback("PrintTestPage", + web_ui_->RegisterMessageCallback("PrintTestPage", NewCallback(this, &CloudPrintSetupMessageHandler::HandlePrintTestPage)); - dom_ui_->RegisterMessageCallback("LearnMore", + web_ui_->RegisterMessageCallback("LearnMore", NewCallback(this, &CloudPrintSetupMessageHandler::HandleLearnMore)); } diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 4c50df1..5869ff7 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -230,7 +230,7 @@ CloudPrintFlowHandler::~CloudPrintFlowHandler() { void CloudPrintFlowHandler::SetDialogDelegate( CloudPrintHtmlDialogDelegate* delegate) { - // Even if setting a new dom_ui, it means any previous task needs + // Even if setting a new WebUI, it means any previous task needs // to be cancelled, it's now invalid. DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); CancelAnyRunningTask(); @@ -249,28 +249,28 @@ void CloudPrintFlowHandler::CancelAnyRunningTask() { } void CloudPrintFlowHandler::RegisterMessages() { - if (!dom_ui_) + if (!web_ui_) return; // TODO(scottbyer) - This is where we will register messages for the // UI JS to use. Needed: Call to update page setup parameters. - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "ShowDebugger", NewCallback(this, &CloudPrintFlowHandler::HandleShowDebugger)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "SendPrintData", NewCallback(this, &CloudPrintFlowHandler::HandleSendPrintData)); - dom_ui_->RegisterMessageCallback( + web_ui_->RegisterMessageCallback( "SetPageParameters", NewCallback(this, &CloudPrintFlowHandler::HandleSetPageParameters)); - if (dom_ui_->tab_contents()) { + if (web_ui_->tab_contents()) { // Also, take the opportunity to set some (minimal) additional // script permissions required for the web UI. // TODO(scottbyer): learn how to make sure we're talking to the // right web site first. - RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); + RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host(); if (rvh && rvh->delegate()) { WebPreferences webkit_prefs = rvh->delegate()->GetWebkitPrefs(); webkit_prefs.allow_scripts_to_close_windows = true; @@ -280,11 +280,11 @@ void CloudPrintFlowHandler::RegisterMessages() { // Register for appropriate notifications, and re-direct the URL // to the real server URL, now that we've gotten an HTML dialog // going. - NavigationController* controller = &dom_ui_->tab_contents()->controller(); + NavigationController* controller = &web_ui_->tab_contents()->controller(); NavigationEntry* pending_entry = controller->pending_entry(); if (pending_entry) pending_entry->set_url(CloudPrintURL( - dom_ui_->GetProfile()).GetCloudPrintServiceDialogURL()); + web_ui_->GetProfile()).GetCloudPrintServiceDialogURL()); registrar_.Add(this, NotificationType::LOAD_STOP, Source<NavigationController>(controller)); } @@ -309,8 +309,8 @@ void CloudPrintFlowHandler::HandleShowDebugger(const ListValue* args) { } void CloudPrintFlowHandler::ShowDebugger() { - if (dom_ui_) { - RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); + if (web_ui_) { + RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host(); if (rvh) DevToolsManager::GetInstance()->OpenDevToolsWindow(rvh); } @@ -318,8 +318,8 @@ void CloudPrintFlowHandler::ShowDebugger() { scoped_refptr<CloudPrintDataSender> CloudPrintFlowHandler::CreateCloudPrintDataSender() { - DCHECK(dom_ui_); - print_data_helper_.reset(new CloudPrintDataSenderHelper(dom_ui_)); + DCHECK(web_ui_); + print_data_helper_.reset(new CloudPrintDataSenderHelper(web_ui_)); return new CloudPrintDataSender(print_data_helper_.get(), print_job_title_); } @@ -330,7 +330,7 @@ void CloudPrintFlowHandler::HandleSendPrintData(const ListValue* args) { // setup parameters becomes asynchronous and may be set while some // data is in flight). Then we can clear out the print data. CancelAnyRunningTask(); - if (dom_ui_) { + if (web_ui_) { print_data_sender_ = CreateCloudPrintDataSender(); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod( @@ -381,11 +381,11 @@ void CloudPrintFlowHandler::HandleSetPageParameters(const ListValue* args) { } void CloudPrintFlowHandler::StoreDialogClientSize() const { - if (dom_ui_ && dom_ui_->tab_contents() && dom_ui_->tab_contents()->view()) { - gfx::Size size = dom_ui_->tab_contents()->view()->GetContainerSize(); - dom_ui_->GetProfile()->GetPrefs()->SetInteger( + if (web_ui_ && web_ui_->tab_contents() && web_ui_->tab_contents()->view()) { + gfx::Size size = web_ui_->tab_contents()->view()->GetContainerSize(); + web_ui_->GetProfile()->GetPrefs()->SetInteger( prefs::kCloudPrintDialogWidth, size.width()); - dom_ui_->GetProfile()->GetPrefs()->SetInteger( + web_ui_->GetProfile()->GetPrefs()->SetInteger( prefs::kCloudPrintDialogHeight, size.height()); } } diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 9e49a28..f215e1a 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -43,17 +43,17 @@ SyncConfiguration::SyncConfiguration() SyncConfiguration::~SyncConfiguration() {} void FlowHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("SubmitAuth", + web_ui_->RegisterMessageCallback("SubmitAuth", NewCallback(this, &FlowHandler::HandleSubmitAuth)); - dom_ui_->RegisterMessageCallback("Configure", + web_ui_->RegisterMessageCallback("Configure", NewCallback(this, &FlowHandler::HandleConfigure)); - dom_ui_->RegisterMessageCallback("Passphrase", + web_ui_->RegisterMessageCallback("Passphrase", NewCallback(this, &FlowHandler::HandlePassphraseEntry)); - dom_ui_->RegisterMessageCallback("PassphraseCancel", + web_ui_->RegisterMessageCallback("PassphraseCancel", NewCallback(this, &FlowHandler::HandlePassphraseCancel)); - dom_ui_->RegisterMessageCallback("FirstPassphrase", + web_ui_->RegisterMessageCallback("FirstPassphrase", NewCallback(this, &FlowHandler::HandleFirstPassphrase)); - dom_ui_->RegisterMessageCallback("GoToDashboard", + web_ui_->RegisterMessageCallback("GoToDashboard", NewCallback(this, &FlowHandler::HandleGoToDashboard)); } @@ -270,8 +270,8 @@ void FlowHandler::ShowGaiaLogin(const DictionaryValue& args) { // So if you ever made a wizard that involved a gaia login as not the first // frame, this call would be necessary to ensure that this method actually // shows the gaia login. - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showGaiaLoginIframe"); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showGaiaLoginIframe"); std::string json; base::JSONWriter::Write(&args, false, &json); @@ -294,8 +294,8 @@ void FlowHandler::ShowConfigure(const DictionaryValue& args) { // If you're starting the wizard at the configure screen (i.e. from // "Customize Sync"), this will be redundant. However, if you're coming from // another wizard state, this will make sure Choose Data Types is on top. - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showConfigure"); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showConfigure"); std::string json; base::JSONWriter::Write(&args, false, &json); @@ -305,8 +305,8 @@ void FlowHandler::ShowConfigure(const DictionaryValue& args) { } void FlowHandler::ShowPassphraseEntry(const DictionaryValue& args) { - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showPassphrase"); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showPassphrase"); std::string json; base::JSONWriter::Write(&args, false, &json); @@ -316,8 +316,8 @@ void FlowHandler::ShowPassphraseEntry(const DictionaryValue& args) { } void FlowHandler::ShowFirstPassphrase(const DictionaryValue& args) { - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showFirstPassphrase"); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showFirstPassphrase"); std::string json; base::JSONWriter::Write(&args, false, &json); @@ -327,8 +327,8 @@ void FlowHandler::ShowFirstPassphrase(const DictionaryValue& args) { } void FlowHandler::ShowSettingUp() { - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showSettingUp"); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showSettingUp"); } void FlowHandler::ShowSetupDone(const std::wstring& user) { @@ -340,8 +340,8 @@ void FlowHandler::ShowSetupDone(const std::wstring& user) { L"(" + UTF8ToWide(json) + L");"; ExecuteJavascriptInIFrame(kDoneIframeXPath, javascript); - if (dom_ui_) - dom_ui_->CallJavascriptFunction(L"showSetupDone", synced_to_string); + if (web_ui_) + web_ui_->CallJavascriptFunction(L"showSetupDone", synced_to_string); ExecuteJavascriptInIFrame(kDoneIframeXPath, L"onPageShown();"); @@ -355,8 +355,8 @@ void FlowHandler::ShowFirstTimeDone(const std::wstring& user) { void FlowHandler::ExecuteJavascriptInIFrame(const std::wstring& iframe_xpath, const std::wstring& js) { - if (dom_ui_) { - RenderViewHost* rvh = dom_ui_->tab_contents()->render_view_host(); + if (web_ui_) { + RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host(); rvh->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath), WideToUTF16Hack(js)); } diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index ed7e77a..4f832312 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -469,7 +469,7 @@ SelectFileDialogImpl::FileBrowseDelegateHandler::FileBrowseDelegateHandler( } void SelectFileDialogImpl::FileBrowseDelegateHandler::RegisterMessages() { - dom_ui_->RegisterMessageCallback("setDialogTitle", + web_ui_->RegisterMessageCallback("setDialogTitle", NewCallback(this, &FileBrowseDelegateHandler::HandleSetDialogTitle)); } @@ -486,7 +486,7 @@ void SelectFileDialogImpl::FileBrowseDelegateHandler::HandleSetDialogTitle( // its title. // TODO(xiyuan): Change this when the infrastructure is improved. HtmlDialogUIDelegate** delegate = HtmlDialogUI::GetPropertyAccessor(). - GetProperty(dom_ui_->tab_contents()->property_bag()); + GetProperty(web_ui_->tab_contents()->property_bag()); HtmlDialogView* containing_view = static_cast<HtmlDialogView*>(*delegate); DCHECK(containing_view); |