Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

content/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2011 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/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 273 matching lines @@
   if (!tab_close_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("Tab.Close",
         base::TimeTicks::Now() - tab_close_start_time_);
   }
 
   FOR_EACH_OBSERVER(WebContentsObserver, observers_, TabContentsDestroyed());
 
   SetDelegate(NULL);
 }
 
+NavigationController& TabContents::GetControllerImpl() {
+  return controller_;
+}
+
 bool TabContents::OnMessageReceived(const IPC::Message& message) {
   if (GetWebUI() && GetWebUI()->OnMessageReceived(message))
     return true;
 
   ObserverListBase<WebContentsObserver>::Iterator it(observers_);
   WebContentsObserver* observer;
   while ((observer = it.GetNext()) != NULL)
     if (observer->OnMessageReceived(message))
       return true;
 
@@ skipping 41 matching lines @@
 
   return handled;
 }
 
 void TabContents::RunFileChooser(
     RenderViewHost* render_view_host,
     const content::FileChooserParams& params) {
   delegate_->RunFileChooser(this, params);
 }
 
-NavigationController& TabContents::GetController() {
+content::NavigationController& TabContents::GetController() {
   return controller_;
 }
 
-const NavigationController& TabContents::GetController() const {
+const content::NavigationController& TabContents::GetController() const {
   return controller_;
 }
 
 content::BrowserContext* TabContents::GetBrowserContext() const {
   return controller_.GetBrowserContext();
 }
 
 void TabContents::SetViewType(content::ViewType type) {
   view_type_ = type;
 }
@@ skipping 265 matching lines @@
 }
 
 TabContents* TabContents::Clone() {
   // We create a new SiteInstance so that the new tab won't share processes
   // with the old one. This can be changed in the future if we need it to share
   // processes for some reason.
   TabContents* tc = new TabContents(
       GetBrowserContext(),
       SiteInstance::CreateSiteInstance(GetBrowserContext()),
       MSG_ROUTING_NONE, this, NULL);
-  tc->GetController().CopyStateFrom(controller_);
+  tc->GetControllerImpl().CopyStateFrom(controller_);
   return tc;
 }
 
 void TabContents::ShowPageInfo(const GURL& url,
                                const SSLStatus& ssl,
                                bool show_history) {
   if (!delegate_)
     return;
 
   delegate_->ShowPageInfo(GetBrowserContext(), url, ssl, show_history);
@@ skipping 620 matching lines @@
 
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
       content::Source<content::NavigationController>(&controller_),
       content::Details<LoadFromMemoryCacheDetails>(&details));
 }
 
 void TabContents::OnDidDisplayInsecureContent() {
   content::RecordAction(UserMetricsAction("SSL.DisplayedInsecureContent"));
   displayed_insecure_content_ = true;
-  SSLManager::NotifySSLInternalStateChanged(&GetController());
+  SSLManager::NotifySSLInternalStateChanged(&GetControllerImpl());
 }
 
 void TabContents::OnDidRunInsecureContent(
     const std::string& security_origin, const GURL& target_url) {
   LOG(INFO) << security_origin << " ran insecure content from "
             << target_url.possibly_invalid_spec();
   content::RecordAction(UserMetricsAction("SSL.RanInsecureContent"));
   if (EndsWith(security_origin, kDotGoogleDotCom, false)) {
     content::RecordAction(
         UserMetricsAction("SSL.RanInsecureContentGoogle"));
   }
   controller_.GetSSLManager()->DidRunInsecureContent(security_origin);
   displayed_insecure_content_ = true;
-  SSLManager::NotifySSLInternalStateChanged(&GetController());
+  SSLManager::NotifySSLInternalStateChanged(&GetControllerImpl());
 }
 
 void TabContents::OnDocumentLoadedInFrame(int64 frame_id) {
   controller_.DocumentLoadedInFrame();
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DocumentLoadedInFrame(frame_id));
 }
 
 void TabContents::OnDidFinishLoad(
     int64 frame_id,
@@ skipping 840 matching lines @@
   // normal size later so just ignore it.
   if (!size.IsEmpty())
     view_->SizeContents(size);
 }
 
 void TabContents::NotifySwappedFromRenderManager() {
   NotifySwapped();
 }
 
 NavigationController& TabContents::GetControllerForRenderManager() {
-  return GetController();
+  return GetControllerImpl();
 }
 
 WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) {
   return content::WebUIFactory::Get()->CreateWebUIForURL(this, url);
 }
 
 NavigationEntry*
     TabContents::GetLastCommittedNavigationEntryForRenderManager() {
   return controller_.GetLastCommittedEntry();
 }
@@ skipping 53 matching lines @@
   encoding_ = content::GetContentClient()->browser()->
       GetCanonicalEncodingNameByAliasName(encoding);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }