Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 6513010: WebUI: Get rid of more references to DOMUI in the rest of the directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 46f87e179353ae1426eee5d96777b08a603ab704..cbfe33f838dfb0d52671c9d6940af66125c804bb 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -667,7 +667,7 @@ bool TabContents::ShouldDisplayURL() {
return true;
}
- WebUI* web_ui = GetDOMUIForCurrentState();
+ WebUI* web_ui = GetWebUIForCurrentState();
if (web_ui)
return !web_ui->should_hide_url();
return true;
@@ -703,7 +703,7 @@ bool TabContents::ShouldDisplayFavIcon() {
if (controller_.GetLastCommittedEntry() && controller_.pending_entry())
return true;
- WebUI* web_ui = GetDOMUIForCurrentState();
+ WebUI* web_ui = GetWebUIForCurrentState();
if (web_ui)
return !web_ui->hide_favicon();
return true;
@@ -1093,7 +1093,7 @@ void TabContents::FocusThroughTabTraversal(bool reverse) {
}
bool TabContents::FocusLocationBarByDefault() {
- WebUI* web_ui = GetDOMUIForCurrentState();
+ WebUI* web_ui = GetWebUIForCurrentState();
if (web_ui)
return web_ui->focus_location_bar_by_default();
NavigationEntry* entry = controller_.GetActiveEntry();
@@ -1198,7 +1198,7 @@ bool TabContents::ShouldShowBookmarkBar() {
if (!browser_defaults::bookmarks_enabled)
return false;
- // See GetDOMUIForCurrentState() comment for more info. This case is very
+ // See GetWebUIForCurrentState() comment for more info. This case is very
// similar, but for non-first loads, we want to use the committed entry. This
// is so the bookmarks bar disappears at the same time the page does.
if (controller_.GetLastCommittedEntry()) {
@@ -1208,7 +1208,7 @@ bool TabContents::ShouldShowBookmarkBar() {
}
// When it's the first load, we know either the pending one or the committed
- // one will have the Web UI in it (see GetDOMUIForCurrentState), and only one
+ // one will have the Web UI in it (see GetWebUIForCurrentState), and only one
// of them will be valid, so we can just check both.
if (render_manager_.pending_web_ui())
return render_manager_.pending_web_ui()->force_bookmark_bar_visible();
@@ -1733,7 +1733,7 @@ void TabContents::ExpireInfoBars(
}
}
-WebUI* TabContents::GetDOMUIForCurrentState() {
+WebUI* TabContents::GetWebUIForCurrentState() {
// When there is a pending navigation entry, we want to use the pending WebUI
// that goes along with it to control the basic flags. For example, we want to
// show the pending URL in the URL bar, so we want the display_url flag to
@@ -1785,7 +1785,7 @@ void TabContents::DidNavigateMainFramePostCommit(
WebUI* web_ui = WebUIFactory::CreateWebUIForURL(this, GetURL());
// web_ui might be NULL if the URL refers to a non-existent extension.
if (web_ui) {
- render_manager_.SetDOMUIPostCommit(web_ui);
+ render_manager_.SetWebUIPostCommit(web_ui);
web_ui->RenderViewCreated(render_view_host());
}
}
@@ -2949,7 +2949,7 @@ NavigationController& TabContents::GetControllerForRenderManager() {
return controller();
}
-WebUI* TabContents::CreateDOMUIForRenderManager(const GURL& url) {
+WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) {
return WebUIFactory::CreateWebUIForURL(this, url);
}
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698