Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

content/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/download/save_package.h"
+#include "chrome/browser/favicon_helper.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/translate_errors.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/language_state.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
@@ skipping 135 matching lines @@
   // time and can be NULL (during setup and teardown).
   RenderWidgetHostView* GetRenderWidgetHostView() const {
     return render_manager_.GetRenderWidgetHostView();
   }
 
   // The TabContentsView will never change and is guaranteed non-NULL.
   TabContentsView* view() const {
     return view_.get();
   }
 
+  // Returns the FaviconHelper of this TabContents.
+  FaviconHelper& favicon_helper() {
+    return *favicon_helper_.get();
+  }
+
   // Tab navigation state ------------------------------------------------------
 
   // Returns the current navigation properties, which if a navigation is
   // pending may be provisional (e.g., the navigation could result in a
   // download, in which case the URL would revert to what it was previously).
   virtual const GURL& GetURL() const;
   virtual const string16& GetTitle() const;
 
   // The max PageID of any page that this TabContents has loaded.  PageIDs
   // increase with each new page that is loaded by a tab.  If this is a
   // TabContents, then the max PageID is kept separately on each SiteInstance.
   // Returns -1 if no PageIDs have yet been seen.
   int32 GetMaxPageID();
 
   // Updates the max PageID to be at least the given PageID.
   void UpdateMaxPageID(int32 page_id);
 
   // Returns the site instance associated with the current page. By default,
   // there is no site instance. TabContents overrides this to provide proper
   // access to its site instance.
   virtual SiteInstance* GetSiteInstance() const;
 
   // Defines whether this tab's URL should be displayed in the browser's URL
   // bar. Normally this is true so you can see the URL. This is set to false
   // for the new tab page and related pages so that the URL bar is empty and
   // the user is invited to type into it.
   virtual bool ShouldDisplayURL();
 
+  // Returns the favicon for this tab, or an isNull() bitmap if the tab does not
+  // have a favicon. The default implementation uses the current navigation
+  // entry.
+  SkBitmap GetFavicon() const;
+
+  // Returns true if we are not using the default favicon.
+  bool FaviconIsValid() const;
+
+  // Returns whether the favicon should be displayed. If this returns false, no
+  // space is provided for the favicon, and the favicon is never displayed.
+  virtual bool ShouldDisplayFavicon();
+
   // Return whether this tab contents is loading a resource.
   bool is_loading() const { return is_loading_; }
 
   // Returns whether this tab contents is waiting for a first-response for the
   // main resource of the page. This controls whether the throbber state is
   // "waiting" or "loading."
   bool waiting_for_response() const { return waiting_for_response_; }
 
   net::LoadState load_state() const { return load_state_; }
   string16 load_state_host() const { return load_state_host_; }
@@ skipping 104 matching lines @@
 
   // Creates a new TabContents with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
   virtual TabContents* Clone();
 
   // Shows the page info.
   void ShowPageInfo(const GURL& url,
                     const NavigationEntry::SSLStatus& ssl,
                     bool show_history);
 
+  // Saves the favicon for the current page.
+  void SaveFavicon();
+
   // Window management ---------------------------------------------------------
 
   // Create a new window constrained to this TabContents' clip and visibility.
   // The window is initialized by using the supplied delegate to obtain basic
   // window characteristics, and the supplied view for the content. Note that
   // the returned ConstrainedWindow might not yet be visible.
   ConstrainedWindow* CreateConstrainedDialog(
       ConstrainedWindowDelegate* delegate);
 
   // Adds a new tab or window with the given already-created contents
@@ skipping 272 matching lines @@
   int content_restrictions() const { return content_restrictions_; }
   void SetContentRestrictions(int restrictions);
 
   safe_browsing::ClientSideDetectionHost* safebrowsing_detection_host() {
     return safebrowsing_detection_host_.get();
   }
 
   // Query the WebUIFactory for the TypeID for the current URL.
   WebUI::TypeID GetWebUITypeForCurrentState();
 
-  // Returns the WebUI for the current state of the tab. This will either be
-  // the pending WebUI, the committed WebUI, or NULL.
-  WebUI* GetWebUIForCurrentState();
-
  protected:
   friend class TabContentsObserver;
   friend class TabContentsObserver::Registrar;
 
   // Add and remove observers for page navigation notifications. Adding or
   // removing multiple times has no effect. The order in which notifications
   // are sent to observers is undefined. Clients must be sure to remove the
   // observer before they go away.
   void AddObserver(TabContentsObserver* observer);
   void RemoveObserver(TabContentsObserver* observer);
@@ skipping 89 matching lines @@
   void SetNotWaitingForResponse() { waiting_for_response_ = false; }
 
   ConstrainedWindowList child_windows_;
 
   // Expires InfoBars that need to be expired, according to the state carried
   // in |details|, in response to a new NavigationEntry being committed (the
   // user navigated to another page).
   void ExpireInfoBars(
       const NavigationController::LoadCommittedDetails& details);
 
+  // Returns the WebUI for the current state of the tab. This will either be
+  // the pending WebUI, the committed WebUI, or NULL.
+  WebUI* GetWebUIForCurrentState();
+
   // Navigation helpers --------------------------------------------------------
   //
   // These functions are helpers for Navigate() and DidNavigate().
 
   // Handles post-navigation tasks in DidNavigate AFTER the entry has been
   // committed to the navigation controller. Note that the navigation entry is
   // not provided since it may be invalid/changed after being committed. The
   // current navigation entry is in the NavigationController at this point.
   void DidNavigateMainFramePostCommit(
       const NavigationController::LoadCommittedDetails& details,
@@ skipping 205 matching lines @@
 
   // Handles plugin messages.
   scoped_ptr<PluginObserver> plugin_observer_;
 
   // TabContentsSSLHelper, lazily created.
   scoped_ptr<TabContentsSSLHelper> ssl_helper_;
 
   // Handles drag and drop event forwarding to extensions.
   BookmarkDrag* bookmark_drag_;
 
+  // Handles downloading favicons.
+  scoped_ptr<FaviconHelper> favicon_helper_;
+
   // RenderViewHost::ContentSettingsDelegate.
   scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
 
   // Handles desktop notification IPCs.
   scoped_ptr<DesktopNotificationHandlerForTC> desktop_notification_handler_;
 
   // Handles IPCs related to SafeBrowsing client-side phishing detection.
   scoped_ptr<safe_browsing::ClientSideDetectionHost>
       safebrowsing_detection_host_;
 
@@ skipping 65 matching lines @@
 
   // See getter above.
   bool is_being_destroyed_;
 
   // Indicates whether we should notify about disconnection of this
   // TabContents. This is used to ensure disconnection notifications only
   // happen if a connection notification has happened and that they happen only
   // once.
   bool notify_disconnection_;
 
+  // Maps from handle to page_id.
+  typedef std::map<FaviconService::Handle, int32> HistoryRequestMap;
+  HistoryRequestMap history_requests_;
+
 #if defined(OS_WIN)
   // Handle to an event that's set when the page is showing a message box (or
   // equivalent constrained window).  Plugin processes check this to know if
   // they should pump messages then.
   base::win::ScopedHandle message_box_active_;
 #endif
 
   // The time that the last javascript message was dismissed.
   base::TimeTicks last_javascript_message_dismissal_;
 
@@ skipping 44 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_