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

Unified Diff: content/browser/tab_contents/tab_contents.h

Issue 8229031: Fix a bug in ShouldDisplayURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix review comments. Created 9 years, 2 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/test/base/browser_with_test_window_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/tab_contents.h
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 8d4848b4671473d17dbfd924f6496309c13a8452..1f3cf4cd1fce3d0e9c712fa0f4d791dfc9ce9cbc 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -127,6 +127,9 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
return render_manager_.web_ui();
}
+ // Returns the committed WebUI if one exists, otherwise the pending one.
+ // Callers who want to use the pending WebUI for the pending navigation entry
+ // should use GetWebUIForCurrentState instead.
WebUI* web_ui() const {
return render_manager_.web_ui() ? render_manager_.web_ui()
: render_manager_.pending_web_ui();
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698