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

chrome/browser/favicon/favicon_tab_helper.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 "chrome/browser/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/public/browser/favicon_status.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 
 using content::FaviconStatus;
 using content::NavigationEntry;
 using content::WebContents;
@@ skipping 13 matching lines @@
 
 void FaviconTabHelper::FetchFavicon(const GURL& url) {
   favicon_handler_->FetchFavicon(url);
   if (touch_icon_handler_.get())
     touch_icon_handler_->FetchFavicon(url);
 }
 
 SkBitmap FaviconTabHelper::GetFavicon() const {
   // Like GetTitle(), we also want to use the favicon for the last committed
   // entry rather than a pending navigation entry.
-  const NavigationController& controller = web_contents()->GetController();
+  const content::NavigationController& controller =
+      web_contents()->GetController();
   NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().bitmap;
 
   entry = controller.GetLastCommittedEntry();
   if (entry)
     return entry->GetFavicon().bitmap;
   return SkBitmap();
 }
 
 bool FaviconTabHelper::FaviconIsValid() const {
-  const NavigationController& controller = web_contents()->GetController();
+  const content::NavigationController& controller =
+      web_contents()->GetController();
   NavigationEntry* entry = controller.GetTransientEntry();
   if (entry)
     return entry->GetFavicon().valid;
 
   entry = controller.GetLastCommittedEntry();
   if (entry)
     return entry->GetFavicon().valid;
 
   return false;
 }
 
 bool FaviconTabHelper::ShouldDisplayFavicon() {
   // Always display a throbber during pending loads.
-  const NavigationController& controller = web_contents()->GetController();
+  const content::NavigationController& controller =
+      web_contents()->GetController();
   if (controller.GetLastCommittedEntry() && controller.GetPendingEntry())
     return true;
 
   WebUI* web_ui = web_contents()->GetWebUIForCurrentState();
   if (web_ui)
     return !web_ui->hide_favicon();
   return true;
 }
 
 void FaviconTabHelper::SaveFavicon() {
@@ skipping 94 matching lines @@
 
 void FaviconTabHelper::OnDidDownloadFavicon(int id,
                                             const GURL& image_url,
                                             bool errored,
                                             const SkBitmap& image) {
   gfx::Image favicon(new SkBitmap(image));
   favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
 }