InstantExtended: Committed NTP

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 1967 matching lines @@
   int id = StartDownload(host, url, image_size);
   favicon_download_map_[id] = callback;
   return id;
 }
 
 bool WebContentsImpl::FocusLocationBarByDefault() {
   WebUI* web_ui = GetWebUIForCurrentState();
   if (web_ui)
     return web_ui->ShouldFocusLocationBarByDefault();
   NavigationEntry* entry = controller_.GetActiveEntry();
-  return (entry && entry->GetURL() == GURL(chrome::kAboutBlankURL));
+  return (entry &&
+          (entry->GetVirtualURL() == GURL(chrome::kAboutBlankURL) ||
+           entry->GetVirtualURL() == GURL(chrome::kChromeUINewTabURL)));

[jam, 2013/01/29 17:51:55]

i dont understand why this change is even needed?

kchromeuinewtaburl should mean that this webcontents is displaying the new
tabui, and so

https://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/ui/webui/n...

should ensure that ShouldFocusLocationBarByDefault returns true?

[samarth, 2013/01/31 16:24:57]

It's because with Instant Extended, the new tab page is no longer necessarily a
WebUI.  Instead, with this change, we're swapping in the instant web contents
when you navigate to the new tab page.

[jam, 2013/02/01 17:44:34]

i see. then you'll need to find another way of doing this, as chrome://newtab
does not belong in the content layer

[Charlie Reis, 2013/02/01 19:58:57]

Perhaps FocusLocationBarByDefault could call out to the ContentBrowserClient?

[samarth, 2013/02/04 20:43:32]

OK, I backed out all the content/ changes for this change. Focusing in the che
common case (opening new tab with ctrl+t or new tab button) can be handled
easily enough in chrome/. I'll file a separate bug to fix the uncommon cases
(navigating to the NTP using back/forward). We may be able to use
ContentBrowserClient as Charlie suggested or do something else.

 }
 
 void WebContentsImpl::SetFocusToLocationBar(bool select_all) {
   if (delegate_)
     delegate_->SetFocusToLocationBar(select_all);
 }
 
 void WebContentsImpl::OnRegisterIntentService(
     const webkit_glue::WebIntentServiceData& data,
     bool user_gesture) {
@@ skipping 1448 matching lines @@
 
 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
   return browser_plugin_guest_.get();
 }
 
 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
   return browser_plugin_embedder_.get();
 }
 
 }  // namespace content