Create a NavigationEntry for the initial blank page.

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/lazy_instance.h"
@@ skipping 694 matching lines @@
 
 const NavigationControllerImpl& WebContentsImpl::GetController() const {
   return controller_;
 }
 
 BrowserContext* WebContentsImpl::GetBrowserContext() const {
   return controller_.GetBrowserContext();
 }
 
 const GURL& WebContentsImpl::GetURL() const {
-  // We may not have a navigation entry yet.
-  NavigationEntry* entry = controller_.GetVisibleEntry();
-  return entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
+  return controller_.GetVisibleEntry()->GetVirtualURL();
 }
 
 const GURL& WebContentsImpl::GetVisibleURL() const {
-  // We may not have a navigation entry yet.
-  NavigationEntry* entry = controller_.GetVisibleEntry();
-  return entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
+  return controller_.GetVisibleEntry()->GetVirtualURL();
 }
 
 const GURL& WebContentsImpl::GetLastCommittedURL() const {
-  // We may not have a navigation entry yet.
-  NavigationEntry* entry = controller_.GetLastCommittedEntry();
-  return entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
+  return controller_.GetLastCommittedEntry()->GetVirtualURL();
 }
 
 WebContentsDelegate* WebContentsImpl::GetDelegate() {
   return delegate_;
 }
 
 void WebContentsImpl::SetDelegate(WebContentsDelegate* delegate) {
   // TODO(cbentzel): remove this debugging code?
   if (delegate == delegate_)
     return;
@@ skipping 208 matching lines @@
 
   // We make an exception for initial navigations. We only want to use the title
   // from the visible entry if:
   // 1. The pending entry has been explicitly assigned a title to display.
   // 2. The user is doing a history navigation in a new tab (e.g., Ctrl+Back),
   //    which case there is a pending entry index other than -1.
   //
   // Otherwise, we want to stick with the last committed entry's title during
   // new navigations, which have pending entries at index -1 with no title.
   if (controller_.IsInitialNavigation() &&
-      ((controller_.GetVisibleEntry() &&
-        !controller_.GetVisibleEntry()->GetTitle().empty()) ||
+      (!controller_.GetVisibleEntry()->GetTitle().empty() ||
        controller_.GetPendingEntryIndex() != -1)) {
     entry = controller_.GetVisibleEntry();
   }
 
-  if (entry) {
-    return entry->GetTitleForDisplay(accept_languages);
-  }
+  // Return the empty string (not about:blank) for the initial blank page.
+  if (controller_.IsInitialNavigation() &&
+      entry == controller_.GetLastCommittedEntry())
+    return entry->GetTitle();
 
-  // |page_title_when_no_navigation_entry_| is finally used
-  // if no title cannot be retrieved.
-  return page_title_when_no_navigation_entry_;
+  return entry->GetTitleForDisplay(accept_languages);
 }
 
 int32 WebContentsImpl::GetMaxPageID() {
   return GetMaxPageIDForSiteInstance(GetSiteInstance());
 }
 
 int32 WebContentsImpl::GetMaxPageIDForSiteInstance(
     SiteInstance* site_instance) {
   if (max_page_ids_.find(site_instance->GetId()) == max_page_ids_.end())
     max_page_ids_[site_instance->GetId()] = -1;
@@ skipping 364 matching lines @@
 
   // Either both routing ids can be given, or neither can be.
   DCHECK((params.routing_id == MSG_ROUTING_NONE &&
               params.main_frame_routing_id == MSG_ROUTING_NONE) ||
          (params.routing_id != MSG_ROUTING_NONE &&
               params.main_frame_routing_id != MSG_ROUTING_NONE));
   GetRenderManager()->Init(params.browser_context, params.site_instance,
                            params.routing_id, params.main_frame_routing_id,
                            MSG_ROUTING_NONE);
   frame_tree_.root()->SetFrameName(params.main_frame_name);
+  controller_.Init(params.site_instance);
 
   WebContentsViewDelegate* delegate =
       GetContentClient()->browser()->GetWebContentsViewDelegate(this);
 
   if (browser_plugin_guest_ &&
       !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
     scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
         this, delegate, &render_view_host_delegate_view_));
 
     WebContentsViewGuest* rv = new WebContentsViewGuest(
@@ skipping 2148 matching lines @@
   // from CreateRenderView and allow that to notify the RenderView for us.
   int max_restored_page_id = controller_.GetMaxRestoredPageID();
   if (max_restored_page_id >
       GetMaxPageIDForSiteInstance(rvh->GetSiteInstance()))
     UpdateMaxPageIDForSiteInstance(rvh->GetSiteInstance(),
                                    max_restored_page_id);
 }
 
 bool WebContentsImpl::UpdateTitleForEntry(NavigationEntryImpl* entry,
                                           const base::string16& title) {
+  DCHECK(entry);
+
   // For file URLs without a title, use the pathname instead. In the case of a
   // synthesized title, we don't want the update to count toward the "one set
   // per page of the title to history."
   base::string16 final_title;
   bool explicit_set;
   if (entry && entry->GetURL().SchemeIsFile() && title.empty()) {
     final_title = base::UTF8ToUTF16(entry->GetURL().ExtractFileName());
     explicit_set = false;  // Don't count synthetic titles toward the set limit.
   } else {
     base::TrimWhitespace(title, base::TRIM_ALL, &final_title);
     explicit_set = true;
   }
 
-  // If a page is created via window.open and never navigated,
-  // there will be no navigation entry. In this situation,
-  // |page_title_when_no_navigation_entry_| will be used for page title.
-  if (entry) {
-    if (final_title == entry->GetTitle())
-      return false;  // Nothing changed, don't bother.
+  if (final_title == entry->GetTitle())
+    return false;  // Nothing changed, don't bother.
 
-    entry->SetTitle(final_title);
-  } else {
-    if (page_title_when_no_navigation_entry_ == final_title)
-      return false;  // Nothing changed, don't bother.
-
-    page_title_when_no_navigation_entry_ = final_title;
-  }
+  entry->SetTitle(final_title);
 
   // Lastly, set the title for the view.
   view_->SetPageTitle(final_title);
 
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     TitleWasSet(entry, explicit_set));
 
   return true;
 }
 
@@ skipping 1079 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content