Add Observer in FaviconTabHelper

chrome/browser/favicon/favicon_tab_helper.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 "chrome/browser/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_handler.h"
@@ skipping 118 matching lines @@
     return;
   const FaviconStatus& favicon(entry->GetFavicon());
   if (!favicon.valid || favicon.url.is_empty() ||
       favicon.image.IsEmpty()) {
     return;
   }
   service->SetFavicons(
       entry->GetURL(), favicon.url, favicon_base::FAVICON, favicon.image);
 }
 
+void FaviconTabHelper::AddObserver(Observer* observer) {
+  observer_list_.AddObserver(observer);
+}
+
+void FaviconTabHelper::RemoveObserver(Observer* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
 int FaviconTabHelper::StartDownload(const GURL& url, int max_image_size) {
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       profile_->GetOriginalProfile(), Profile::IMPLICIT_ACCESS);
   if (favicon_service && favicon_service->WasUnableToDownloadFavicon(url)) {
     DVLOG(1) << "Skip Failed FavIcon: " << url;
     return 0;
   }
 
   return web_contents()->DownloadImage(
       url,
       true,
       max_image_size,
       base::Bind(&FaviconTabHelper::DidDownloadFavicon,base::Unretained(this)));
 }
 
-void FaviconTabHelper::NotifyFaviconUpdated(bool icon_url_changed) {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_FAVICON_UPDATED,
-      content::Source<WebContents>(web_contents()),
-      content::Details<bool>(&icon_url_changed));
-  web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
-}
-
 bool FaviconTabHelper::IsOffTheRecord() {
   DCHECK(web_contents());
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
 
 const gfx::Image FaviconTabHelper::GetActiveFaviconImage() {
   return GetFaviconStatus().image;
 }
 
 const GURL FaviconTabHelper::GetActiveFaviconURL() {
@@ skipping 16 matching lines @@
 }
 
 void FaviconTabHelper::SetActiveFaviconURL(GURL url) {
   GetFaviconStatus().url = url;
 }
 
 void FaviconTabHelper::SetActiveFaviconValidity(bool validity) {
   GetFaviconStatus().valid = validity;
 }
 
+void FaviconTabHelper::OnFaviconAvailable(const gfx::Image& image,
+                                          const GURL& icon_url,
+                                          bool update_active_favicon) {
+  if (update_active_favicon) {
+    // No matter what happens, we need to mark the favicon as being set.
+    SetActiveFaviconValidity(true);
+    bool icon_url_changed = GetActiveFaviconURL() != icon_url;
+    SetActiveFaviconURL(icon_url);
+
+    if (image.IsEmpty())
+      return;
+
+    SetActiveFaviconImage(image);
+    content::NotificationService::current()->Notify(
+        chrome::NOTIFICATION_FAVICON_UPDATED,
+        content::Source<WebContents>(web_contents()),
+        content::Details<bool>(&icon_url_changed));
+    web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
+  }
+  if (!image.IsEmpty())
+    FOR_EACH_OBSERVER(Observer, observer_list_, OnFaviconAvailable(image));
+}
+
 content::FaviconStatus& FaviconTabHelper::GetFaviconStatus() {
   DCHECK(web_contents()->GetController().GetActiveEntry());
   return web_contents()->GetController().GetActiveEntry()->GetFavicon();
 }
 
 void FaviconTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     NavigationController::ReloadType reload_type) {
   if (reload_type != NavigationController::NO_RELOAD &&
       !profile_->IsOffTheRecord()) {
@@ skipping 66 matching lines @@
       favicon_service->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
 }