diff options
Diffstat (limited to 'chrome/browser')
28 files changed, 95 insertions, 95 deletions
diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index 8aaa576..f988dd5 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.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. @@ -201,8 +201,8 @@ ImageBurnHandler::~ImageBurnHandler() { download_manager_->RemoveObserver(this); } -WebUIMessageHandler* ImageBurnHandler::Attach(DOMUI* dom_ui) { - return WebUIMessageHandler::Attach(dom_ui); +WebUIMessageHandler* ImageBurnHandler::Attach(WebUI* web_ui) { + return WebUIMessageHandler::Attach(web_ui); } void ImageBurnHandler::RegisterMessages() { @@ -645,7 +645,7 @@ net::FileStream* ImageBurnResourceManager::CreateFileStream( // ImageBurnUI // //////////////////////////////////////////////////////////////////////////////// -ImageBurnUI::ImageBurnUI(TabContents* contents) : DOMUI(contents) { +ImageBurnUI::ImageBurnUI(TabContents* contents) : WebUI(contents) { ImageBurnHandler* handler = new ImageBurnHandler(contents); AddMessageHandler((handler)->Attach(this)); ImageBurnUIHTMLSource* html_source = new ImageBurnUIHTMLSource(); diff --git a/chrome/browser/chromeos/dom_ui/login/login_ui.cc b/chrome/browser/chromeos/dom_ui/login/login_ui.cc index a1ba4e0..9cc6b5a 100644 --- a/chrome/browser/chromeos/dom_ui/login/login_ui.cc +++ b/chrome/browser/chromeos/dom_ui/login/login_ui.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. @@ -61,8 +61,8 @@ LoginUIHandler::LoginUIHandler() facade_->Setup(); } -WebUIMessageHandler* LoginUIHandler::Attach(DOMUI* dom_ui) { - return WebUIMessageHandler::Attach(dom_ui); +WebUIMessageHandler* LoginUIHandler::Attach(WebUI* web_ui) { + return WebUIMessageHandler::Attach(web_ui); } void LoginUIHandler::RegisterMessages() { @@ -151,7 +151,7 @@ void LoginUIHandler::OnOffTheRecordLoginSuccess() { // //////////////////////////////////////////////////////////////////////////////// LoginUI::LoginUI(TabContents* contents) - : DOMUI(contents) { + : WebUI(contents) { LoginUIHandler* handler = new LoginUIHandler(); AddMessageHandler(handler->Attach(this)); LoginUIHTMLSource* html_source = diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc index f0e3b48..dc3b0c9 100644 --- a/chrome/browser/chromeos/dom_ui/menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc @@ -248,7 +248,7 @@ class MenuHandler : public chromeos::MenuHandlerBase, virtual ~MenuHandler(); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); private: @@ -259,7 +259,7 @@ class MenuHandler : public chromeos::MenuHandlerBase, void HandleMoveInputToParent(const ListValue* values); void HandleCloseAll(const ListValue* values); void HandleModelUpdated(const ListValue* values); - // This is a utility DOMUI message to print debug message. + // This is a utility WebUI message to print debug message. // Menu can't use dev tool as it lives outside of browser. // TODO(oshima): This is inconvenient and figure out how we can use // dev tools for menus (and other domui that does not belong to browser). @@ -350,9 +350,9 @@ MenuHandler::MenuHandler() : loaded_(false) { MenuHandler::~MenuHandler() { } -WebUIMessageHandler* MenuHandler::Attach(DOMUI* dom_ui) { - WebUIMessageHandler* handler = WebUIMessageHandler::Attach(dom_ui); - dom_ui->tab_contents()->set_delegate(this); +WebUIMessageHandler* MenuHandler::Attach(WebUI* web_ui) { + WebUIMessageHandler* handler = WebUIMessageHandler::Attach(web_ui); + web_ui->tab_contents()->set_delegate(this); return handler; } @@ -528,7 +528,7 @@ ui::MenuModel* MenuHandlerBase::GetMenuModel() { // //////////////////////////////////////////////////////////////////////////////// -MenuUI::MenuUI(TabContents* contents) : DOMUI(contents) { +MenuUI::MenuUI(TabContents* contents) : WebUI(contents) { MenuHandler* handler = new MenuHandler(); AddMessageHandler((handler)->Attach(this)); @@ -537,7 +537,7 @@ MenuUI::MenuUI(TabContents* contents) : DOMUI(contents) { } MenuUI::MenuUI(TabContents* contents, ChromeURLDataManager::DataSource* source) - : DOMUI(contents) { + : WebUI(contents) { MenuHandler* handler = new MenuHandler(); AddMessageHandler((handler)->Attach(this)); diff --git a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc index ac3688e..5d422e9 100644 --- a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc +++ b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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. @@ -164,7 +164,7 @@ class MobileSetupHandler void Init(TabContents* contents); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); // NetworkLibrary::NetworkManagerObserver implementation. @@ -222,7 +222,7 @@ class MobileSetupHandler DISALLOW_COPY_AND_ASSIGN(TaskProxy); }; - // Handlers for JS DOMUI messages. + // Handlers for JS WebUI messages. void HandleSetTransactionStatus(const ListValue* args); void HandleStartActivation(const ListValue* args); void SetTransactionStatus(const std::string& status); @@ -260,7 +260,7 @@ class MobileSetupHandler // Check the current cellular network for error conditions. bool GotActivationError(const chromeos::CellularNetwork* network, std::string* error); - // Sends status updates to DOMUI page. + // Sends status updates to WebUI page. void UpdatePage(chromeos::CellularNetwork* network, const std::string& error_description); // Changes internal state. @@ -464,8 +464,8 @@ MobileSetupHandler::~MobileSetupHandler() { ReEnableOtherConnections(); } -WebUIMessageHandler* MobileSetupHandler::Attach(DOMUI* dom_ui) { - return WebUIMessageHandler::Attach(dom_ui); +WebUIMessageHandler* MobileSetupHandler::Attach(WebUI* web_ui) { + return WebUIMessageHandler::Attach(web_ui); } void MobileSetupHandler::Init(TabContents* contents) { @@ -1313,7 +1313,7 @@ void MobileSetupHandler::LoadCellularConfig() { // //////////////////////////////////////////////////////////////////////////////// -MobileSetupUI::MobileSetupUI(TabContents* contents) : DOMUI(contents) { +MobileSetupUI::MobileSetupUI(TabContents* contents) : WebUI(contents) { const chromeos::CellularNetwork* network = GetCellularNetwork(); std::string service_path = network ? network->service_path() : std::string(); MobileSetupHandler* handler = new MobileSetupHandler(service_path); diff --git a/chrome/browser/chromeos/dom_ui/register_page_ui.cc b/chrome/browser/chromeos/dom_ui/register_page_ui.cc index f3e4453..bd61126 100644 --- a/chrome/browser/chromeos/dom_ui/register_page_ui.cc +++ b/chrome/browser/chromeos/dom_ui/register_page_ui.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. @@ -118,11 +118,11 @@ class RegisterPageHandler : public WebUIMessageHandler, void Init(); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); private: - // Handlers for JS DOMUI messages. + // Handlers for JS WebUI messages. void HandleGetRegistrationUrl(const ListValue* args); void HandleGetUserInfo(const ListValue* args); @@ -201,8 +201,8 @@ RegisterPageHandler::RegisterPageHandler() { RegisterPageHandler::~RegisterPageHandler() { } -WebUIMessageHandler* RegisterPageHandler::Attach(DOMUI* dom_ui) { - return WebUIMessageHandler::Attach(dom_ui); +WebUIMessageHandler* RegisterPageHandler::Attach(WebUI* web_ui) { + return WebUIMessageHandler::Attach(web_ui); } void RegisterPageHandler::Init() { @@ -317,7 +317,7 @@ void RegisterPageHandler::SendUserInfo() { // //////////////////////////////////////////////////////////////////////////////// -RegisterPageUI::RegisterPageUI(TabContents* contents) : DOMUI(contents){ +RegisterPageUI::RegisterPageUI(TabContents* contents) : WebUI(contents){ RegisterPageHandler* handler = new RegisterPageHandler(); AddMessageHandler((handler)->Attach(this)); handler->Init(); diff --git a/chrome/browser/chromeos/dom_ui/system_info_ui.cc b/chrome/browser/chromeos/dom_ui/system_info_ui.cc index 93b8456..3d485eb 100644 --- a/chrome/browser/chromeos/dom_ui/system_info_ui.cc +++ b/chrome/browser/chromeos/dom_ui/system_info_ui.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. @@ -68,7 +68,7 @@ class SystemInfoHandler : public WebUIMessageHandler, virtual ~SystemInfoHandler(); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); private: @@ -160,9 +160,9 @@ SystemInfoHandler::SystemInfoHandler() { SystemInfoHandler::~SystemInfoHandler() { } -WebUIMessageHandler* SystemInfoHandler::Attach(DOMUI* dom_ui) { +WebUIMessageHandler* SystemInfoHandler::Attach(WebUI* web_ui) { // TODO(stevenjb): customize handler attach if needed... - return WebUIMessageHandler::Attach(dom_ui); + return WebUIMessageHandler::Attach(web_ui); } void SystemInfoHandler::RegisterMessages() { @@ -175,7 +175,7 @@ void SystemInfoHandler::RegisterMessages() { // //////////////////////////////////////////////////////////////////////////////// -SystemInfoUI::SystemInfoUI(TabContents* contents) : DOMUI(contents) { +SystemInfoUI::SystemInfoUI(TabContents* contents) : WebUI(contents) { SystemInfoHandler* handler = new SystemInfoHandler(); AddMessageHandler((handler)->Attach(this)); SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource(); diff --git a/chrome/browser/dom_ui/bookmarks_ui.cc b/chrome/browser/dom_ui/bookmarks_ui.cc index 490b102..828ab54 100644 --- a/chrome/browser/dom_ui/bookmarks_ui.cc +++ b/chrome/browser/dom_ui/bookmarks_ui.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. @@ -46,7 +46,7 @@ std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const { // //////////////////////////////////////////////////////////////////////////////// -BookmarksUI::BookmarksUI(TabContents* contents) : DOMUI(contents) { +BookmarksUI::BookmarksUI(TabContents* contents) : WebUI(contents) { BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource(); // Set up the chrome://bookmarks/ source. diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index 4e21b29..daa5e2d 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.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. @@ -194,7 +194,7 @@ void ConflictsDOMHandler::Observe(NotificationType type, // /////////////////////////////////////////////////////////////////////////////// -ConflictsUI::ConflictsUI(TabContents* contents) : DOMUI(contents) { +ConflictsUI::ConflictsUI(TabContents* contents) : WebUI(contents) { UserMetrics::RecordAction( UserMetricsAction("ViewAboutConflicts"), contents->profile()); diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc index 755451c..091997c 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.cc +++ b/chrome/browser/dom_ui/constrained_html_ui.cc @@ -15,7 +15,7 @@ static base::LazyInstance<PropertyAccessor<ConstrainedHtmlUIDelegate*> > g_constrained_html_ui_property_accessor(base::LINKER_INITIALIZED); ConstrainedHtmlUI::ConstrainedHtmlUI(TabContents* contents) - : DOMUI(contents) { + : WebUI(contents) { } ConstrainedHtmlUI::~ConstrainedHtmlUI() { diff --git a/chrome/browser/dom_ui/devtools_ui.cc b/chrome/browser/dom_ui/devtools_ui.cc index ddb55c8..45b2bb3 100644 --- a/chrome/browser/dom_ui/devtools_ui.cc +++ b/chrome/browser/dom_ui/devtools_ui.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. @@ -7,7 +7,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/render_messages.h" -DevToolsUI::DevToolsUI(TabContents* contents) : DOMUI(contents) { +DevToolsUI::DevToolsUI(TabContents* contents) : WebUI(contents) { } void DevToolsUI::RenderViewCreated(RenderViewHost* render_view_host) { diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 2fadd47..4f326f4 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.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. @@ -124,7 +124,7 @@ void DownloadsUIHTMLSource::StartDataRequest(const std::string& path, // /////////////////////////////////////////////////////////////////////////////// -DownloadsUI::DownloadsUI(TabContents* contents) : DOMUI(contents) { +DownloadsUI::DownloadsUI(TabContents* contents) : WebUI(contents) { DownloadManager* dlm = GetProfile()->GetDownloadManager(); DownloadsDOMHandler* handler = new DownloadsDOMHandler(dlm); diff --git a/chrome/browser/dom_ui/flags_ui.cc b/chrome/browser/dom_ui/flags_ui.cc index b301673..c9ea169 100644 --- a/chrome/browser/dom_ui/flags_ui.cc +++ b/chrome/browser/dom_ui/flags_ui.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. @@ -176,7 +176,7 @@ void FlagsDOMHandler::HandleRestartBrowser(const ListValue* args) { // /////////////////////////////////////////////////////////////////////////////// -FlagsUI::FlagsUI(TabContents* contents) : DOMUI(contents) { +FlagsUI::FlagsUI(TabContents* contents) : WebUI(contents) { AddMessageHandler((new FlagsDOMHandler())->Attach(this)); FlagsUIHTMLSource* html_source = new FlagsUIHTMLSource(); diff --git a/chrome/browser/dom_ui/gpu_internals_ui.cc b/chrome/browser/dom_ui/gpu_internals_ui.cc index 9948264..7b399ce6 100644 --- a/chrome/browser/dom_ui/gpu_internals_ui.cc +++ b/chrome/browser/dom_ui/gpu_internals_ui.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. @@ -61,7 +61,7 @@ class GpuHTMLSource : public ChromeURLDataManager::DataSource { }; // This class receives javascript messages from the renderer. -// Note that the DOMUI infrastructure runs on the UI thread, therefore all of +// Note that the WebUI infrastructure runs on the UI thread, therefore all of // this class's methods are expected to run on the UI thread. class GpuMessageHandler : public WebUIMessageHandler, @@ -71,7 +71,7 @@ class GpuMessageHandler virtual ~GpuMessageHandler(); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); // Mesages @@ -139,9 +139,9 @@ GpuMessageHandler::GpuMessageHandler() { GpuMessageHandler::~GpuMessageHandler() {} -WebUIMessageHandler* GpuMessageHandler::Attach(DOMUI* dom_ui) { +WebUIMessageHandler* GpuMessageHandler::Attach(WebUI* web_ui) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - WebUIMessageHandler* result = WebUIMessageHandler::Attach(dom_ui); + WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui); return result; } @@ -361,7 +361,7 @@ Value* GpuMessageHandler::OnRequestLogMessages(const ListValue*) { // //////////////////////////////////////////////////////////////////////////////// -GpuInternalsUI::GpuInternalsUI(TabContents* contents) : DOMUI(contents) { +GpuInternalsUI::GpuInternalsUI(TabContents* contents) : WebUI(contents) { AddMessageHandler((new GpuMessageHandler())->Attach(this)); GpuHTMLSource* html_source = new GpuHTMLSource(); diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index aaf7fdc..5c9c84d 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -127,16 +127,16 @@ BrowsingHistoryHandler2::~BrowsingHistoryHandler2() { cancelable_delete_consumer_.CancelAllRequests(); } -WebUIMessageHandler* BrowsingHistoryHandler2::Attach(DOMUI* dom_ui) { +WebUIMessageHandler* BrowsingHistoryHandler2::Attach(WebUI* web_ui) { // Create our favicon data source. - Profile* profile = dom_ui->GetProfile(); + Profile* profile = web_ui->GetProfile(); profile->GetChromeURLDataManager()->AddDataSource( new WebUIFavIconSource(profile)); // Get notifications when history is cleared. registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED, - Source<Profile>(dom_ui->GetProfile()->GetOriginalProfile())); - return WebUIMessageHandler::Attach(dom_ui); + Source<Profile>(web_ui->GetProfile()->GetOriginalProfile())); + return WebUIMessageHandler::Attach(web_ui); } void BrowsingHistoryHandler2::RegisterMessages() { @@ -391,7 +391,7 @@ void BrowsingHistoryHandler2::Observe(NotificationType type, // //////////////////////////////////////////////////////////////////////////////// -HistoryUI2::HistoryUI2(TabContents* contents) : DOMUI(contents) { +HistoryUI2::HistoryUI2(TabContents* contents) : WebUI(contents) { AddMessageHandler((new BrowsingHistoryHandler2())->Attach(this)); HistoryUIHTMLSource2* html_source = new HistoryUIHTMLSource2(); diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 80be7d3..8e5e59e 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -127,16 +127,16 @@ BrowsingHistoryHandler::~BrowsingHistoryHandler() { cancelable_delete_consumer_.CancelAllRequests(); } -WebUIMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) { +WebUIMessageHandler* BrowsingHistoryHandler::Attach(WebUI* web_ui) { // Create our favicon data source. - Profile* profile = dom_ui->GetProfile(); + Profile* profile = web_ui->GetProfile(); profile->GetChromeURLDataManager()->AddDataSource( new WebUIFavIconSource(profile)); // Get notifications when history is cleared. registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED, Source<Profile>(profile->GetOriginalProfile())); - return WebUIMessageHandler::Attach(dom_ui); + return WebUIMessageHandler::Attach(web_ui); } void BrowsingHistoryHandler::RegisterMessages() { @@ -379,7 +379,7 @@ void BrowsingHistoryHandler::Observe(NotificationType type, // //////////////////////////////////////////////////////////////////////////////// -HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) { +HistoryUI::HistoryUI(TabContents* contents) : WebUI(contents) { AddMessageHandler((new BrowsingHistoryHandler())->Attach(this)); HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource(); diff --git a/chrome/browser/dom_ui/html_dialog_ui.cc b/chrome/browser/dom_ui/html_dialog_ui.cc index 3e4da17..766dfc9 100644 --- a/chrome/browser/dom_ui/html_dialog_ui.cc +++ b/chrome/browser/dom_ui/html_dialog_ui.cc @@ -15,18 +15,18 @@ static base::LazyInstance<PropertyAccessor<HtmlDialogUIDelegate*> > g_html_dialog_ui_property_accessor(base::LINKER_INITIALIZED); -HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents) : DOMUI(tab_contents) { +HtmlDialogUI::HtmlDialogUI(TabContents* tab_contents) : WebUI(tab_contents) { } HtmlDialogUI::~HtmlDialogUI() { // Don't unregister our property. During the teardown of the TabContents, // this will be deleted, but the TabContents will already be destroyed. // - // This object is owned indirectly by the TabContents. DOMUIs can change, so - // it's scary if this DOMUI is changed out and replaced with something else, + // This object is owned indirectly by the TabContents. WebUIs can change, so + // it's scary if this WebUI is changed out and replaced with something else, // since the property will still point to the old delegate. But the delegate // is itself the owner of the TabContents for a dialog so will be in scope, - // and the HTML dialogs won't swap DOMUIs anyway since they don't navigate. + // and the HTML dialogs won't swap WebUIs anyway since they don't navigate. } // static diff --git a/chrome/browser/dom_ui/keyboard_ui.cc b/chrome/browser/dom_ui/keyboard_ui.cc index 375acd1..ea770e4 100644 --- a/chrome/browser/dom_ui/keyboard_ui.cc +++ b/chrome/browser/dom_ui/keyboard_ui.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. @@ -18,7 +18,7 @@ // KeyboardUI KeyboardUI::KeyboardUI(TabContents* contents) - : DOMUI(contents) { + : WebUI(contents) { KeyboardHTMLSource* html_source = new KeyboardHTMLSource(); contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); } diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index 858d6d8..ace6006 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -102,7 +102,7 @@ class MediaplayerHandler : public WebUIMessageHandler, void Init(bool is_playlist, TabContents* contents); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); // Callback for the "currentOffsetChanged" message. @@ -207,13 +207,13 @@ MediaplayerHandler::MediaplayerHandler(bool is_playlist) MediaplayerHandler::~MediaplayerHandler() { } -WebUIMessageHandler* MediaplayerHandler::Attach(DOMUI* dom_ui) { +WebUIMessageHandler* MediaplayerHandler::Attach(WebUI* web_ui) { // Create our favicon data source. - Profile* profile = dom_ui->GetProfile(); + Profile* profile = web_ui->GetProfile(); profile->GetChromeURLDataManager()->AddDataSource( new WebUIFavIconSource(profile)); - return WebUIMessageHandler::Attach(dom_ui); + return WebUIMessageHandler::Attach(web_ui); } void MediaplayerHandler::Init(bool is_playlist, TabContents* contents) { @@ -594,7 +594,7 @@ MediaPlayer::MediaPlayer() // //////////////////////////////////////////////////////////////////////////////// -MediaplayerUI::MediaplayerUI(TabContents* contents) : DOMUI(contents) { +MediaplayerUI::MediaplayerUI(TabContents* contents) : WebUI(contents) { const GURL& url = contents->GetURL(); bool is_playlist = (url.ref() == "playlist"); MediaplayerHandler* handler = new MediaplayerHandler(is_playlist); diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index d4f6174..5e65053 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -284,7 +284,7 @@ void NewTabPageClosePromoHandler::HandleClosePromo( // NewTabUI NewTabUI::NewTabUI(TabContents* contents) - : DOMUI(contents) { + : WebUI(contents) { // Override some options on the Web UI. hide_favicon_ = true; force_bookmark_bar_visible_ = true; diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 13cb3aa..557fe49 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -149,7 +149,7 @@ void OptionsPageUIHandler::RegisterStrings( //////////////////////////////////////////////////////////////////////////////// OptionsUI::OptionsUI(TabContents* contents) - : DOMUI(contents), initialized_handlers_(false) { + : WebUI(contents), initialized_handlers_(false) { DictionaryValue* localized_strings = new DictionaryValue(); #if defined(OS_CHROMEOS) @@ -240,7 +240,7 @@ void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) { #endif render_view_host->SetDOMUIProperty("commandLineString", command_line_string); - DOMUI::RenderViewCreated(render_view_host); + WebUI::RenderViewCreated(render_view_host); } void OptionsUI::DidBecomeActiveForReusedRenderView() { @@ -252,7 +252,7 @@ void OptionsUI::DidBecomeActiveForReusedRenderView() { // initialized). CallJavascriptFunction(L"OptionsPage.reinitializeCore"); - DOMUI::DidBecomeActiveForReusedRenderView(); + WebUI::DidBecomeActiveForReusedRenderView(); } // static diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index 022a06a..0a2ae86 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -137,7 +137,7 @@ class PluginsDOMHandler : public WebUIMessageHandler, virtual ~PluginsDOMHandler() {} // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); // Callback for the "requestPluginsData" message. @@ -199,12 +199,12 @@ PluginsDOMHandler::PluginsDOMHandler() NotificationService::AllSources()); } -WebUIMessageHandler* PluginsDOMHandler::Attach(DOMUI* dom_ui) { - PrefService* prefs = dom_ui->GetProfile()->GetPrefs(); +WebUIMessageHandler* PluginsDOMHandler::Attach(WebUI* web_ui) { + PrefService* prefs = web_ui->GetProfile()->GetPrefs(); show_details_.Init(prefs::kPluginsShowDetails, prefs, this); - return WebUIMessageHandler::Attach(dom_ui); + return WebUIMessageHandler::Attach(web_ui); } void PluginsDOMHandler::RegisterMessages() { @@ -343,7 +343,7 @@ void PluginsDOMHandler::PluginsLoaded(ListWrapper* wrapper) { // /////////////////////////////////////////////////////////////////////////////// -PluginsUI::PluginsUI(TabContents* contents) : DOMUI(contents) { +PluginsUI::PluginsUI(TabContents* contents) : WebUI(contents) { AddMessageHandler((new PluginsDOMHandler())->Attach(this)); PluginsUIHTMLSource* html_source = new PluginsUIHTMLSource(); diff --git a/chrome/browser/dom_ui/print_preview_ui.cc b/chrome/browser/dom_ui/print_preview_ui.cc index a52d173..688ec81 100644 --- a/chrome/browser/dom_ui/print_preview_ui.cc +++ b/chrome/browser/dom_ui/print_preview_ui.cc @@ -12,7 +12,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" PrintPreviewUI::PrintPreviewUI(TabContents* contents) - : DOMUI(contents), + : WebUI(contents), html_source_(new PrintPreviewUIHTMLSource()) { // PrintPreviewUI owns |handler|. PrintPreviewHandler* handler = new PrintPreviewHandler(); diff --git a/chrome/browser/dom_ui/remoting_ui.cc b/chrome/browser/dom_ui/remoting_ui.cc index 648b857..e849bb0 100644 --- a/chrome/browser/dom_ui/remoting_ui.cc +++ b/chrome/browser/dom_ui/remoting_ui.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. @@ -62,7 +62,7 @@ void RemotingUIHTMLSource::StartDataRequest(const std::string& path, // /////////////////////////////////////////////////////////////////////////////// -RemotingUI::RemotingUI(TabContents* contents) : DOMUI(contents) { +RemotingUI::RemotingUI(TabContents* contents) : WebUI(contents) { RemotingUIHTMLSource* html_source = new RemotingUIHTMLSource(); // Set up the chrome://remoting source. diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc index 105fd79..4693e0c 100644 --- a/chrome/browser/dom_ui/slideshow_ui.cc +++ b/chrome/browser/dom_ui/slideshow_ui.cc @@ -73,7 +73,7 @@ class SlideshowHandler : public net::DirectoryLister::DirectoryListerDelegate, virtual void OnListDone(int error); // WebUIMessageHandler implementation. - virtual WebUIMessageHandler* Attach(DOMUI* dom_ui); + virtual WebUIMessageHandler* Attach(WebUI* web_ui); virtual void RegisterMessages(); void GetChildrenForPath(const FilePath& path, bool is_refresh); @@ -147,12 +147,12 @@ SlideshowHandler::~SlideshowHandler() { } } -WebUIMessageHandler* SlideshowHandler::Attach(DOMUI* dom_ui) { - profile_ = dom_ui->GetProfile(); +WebUIMessageHandler* SlideshowHandler::Attach(WebUI* web_ui) { + profile_ = web_ui->GetProfile(); // Create our favicon data source. profile_->GetChromeURLDataManager()->AddDataSource( new WebUIFavIconSource(profile_)); - return WebUIMessageHandler::Attach(dom_ui); + return WebUIMessageHandler::Attach(web_ui); } void SlideshowHandler::Init() { @@ -273,7 +273,7 @@ void SlideshowHandler::OnListDone(int error) { // //////////////////////////////////////////////////////////////////////////////// -SlideshowUI::SlideshowUI(TabContents* contents) : DOMUI(contents) { +SlideshowUI::SlideshowUI(TabContents* contents) : WebUI(contents) { SlideshowHandler* handler = new SlideshowHandler(); AddMessageHandler((handler)->Attach(this)); handler->Init(); diff --git a/chrome/browser/dom_ui/sync_internals_ui.cc b/chrome/browser/dom_ui/sync_internals_ui.cc index bf36c5f..0d0e2c5 100644 --- a/chrome/browser/dom_ui/sync_internals_ui.cc +++ b/chrome/browser/dom_ui/sync_internals_ui.cc @@ -22,7 +22,7 @@ #include "chrome/common/render_messages_params.h" SyncInternalsUI::SyncInternalsUI(TabContents* contents) - : DOMUI(contents) { + : WebUI(contents) { browser_sync::JsFrontend* backend = GetJsFrontend(); if (backend) { backend->AddHandler(this); diff --git a/chrome/browser/dom_ui/textfields_ui.cc b/chrome/browser/dom_ui/textfields_ui.cc index cca22c9..a0aabcd 100644 --- a/chrome/browser/dom_ui/textfields_ui.cc +++ b/chrome/browser/dom_ui/textfields_ui.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. @@ -62,7 +62,7 @@ void TextfieldsDOMHandler::HandleTextfieldValue(const ListValue* args) { /** * TextfieldsUI implementation. */ -TextfieldsUI::TextfieldsUI(TabContents* contents) : DOMUI(contents) { +TextfieldsUI::TextfieldsUI(TabContents* contents) : WebUI(contents) { TextfieldsDOMHandler* handler = new TextfieldsDOMHandler(); AddMessageHandler(handler); handler->Attach(this); diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 0fc87704..d119108 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -123,7 +123,7 @@ const char ExtensionWebUI::kExtensionURLOverrides[] = "extensions.chrome_url_overrides"; ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url) - : DOMUI(tab_contents), + : WebUI(tab_contents), url_(url) { ExtensionService* service = tab_contents->profile()->GetExtensionService(); const Extension* extension = service->GetExtensionByURL(url); @@ -135,7 +135,7 @@ ExtensionWebUI::ExtensionWebUI(TabContents* tab_contents, const GURL& url) should_hide_url_ = !extension->is_hosted_app(); bindings_ = BindingsPolicy::EXTENSION; - // Bind externalHost to Extension DOMUI loaded in Chrome Frame. + // Bind externalHost to Extension WebUI loaded in Chrome Frame. const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); if (browser_command_line.HasSwitch(switches::kChromeFrame)) bindings_ |= BindingsPolicy::EXTERNAL_HOST; @@ -209,7 +209,7 @@ gfx::NativeWindow ExtensionWebUI::GetCustomFrameNativeWindow() { return NULL; // If there was no browser associated with the function dispatcher delegate, - // then this DOMUI may be hosted in an ExternalTabContainer, and a framing + // then this WebUI may be hosted in an ExternalTabContainer, and a framing // window will be accessible through the tab_contents. TabContentsDelegate* tab_contents_delegate = tab_contents()->delegate(); if (tab_contents_delegate) diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index c0406dd..1149e7d 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.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. @@ -948,7 +948,7 @@ ExtensionsDOMHandler::~ExtensionsDOMHandler() { // ExtensionsDOMHandler, public: ----------------------------------------------- -ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) { +ExtensionsUI::ExtensionsUI(TabContents* contents) : WebUI(contents) { ExtensionService *exstension_service = GetProfile()->GetOriginalProfile()->GetExtensionService(); |