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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11824050: InstantExtended: Committed NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use WebContentsDelegate for focusing omnibox by default. Created 7 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/common/chrome_notification_types.h ('k') | content/public/browser/web_contents_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 2db6514b6d96651fa5b270f296a59b20c7cd7f5d..bddf226aa41510105cefc6b9583c1040b795928c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1987,7 +1987,11 @@ bool WebContentsImpl::FocusLocationBarByDefault() {
if (web_ui)
return web_ui->ShouldFocusLocationBarByDefault();
NavigationEntry* entry = controller_.GetActiveEntry();
- return (entry && entry->GetURL() == GURL(chrome::kAboutBlankURL));
+ if (entry && entry->GetURL() == GURL(chrome::kAboutBlankURL))
+ return true;
+ if (delegate_)
+ return delegate_->ShouldFocusLocationBarByDefault(this);
+ return false;
jam 2013/02/06 22:22:51 nit: return delegate_ && delegate_->Foo(); that ma
}
void WebContentsImpl::SetFocusToLocationBar(bool select_all) {
« no previous file with comments | « chrome/common/chrome_notification_types.h ('k') | content/public/browser/web_contents_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698