Trigger a tab updated event if the favicon URL changes.

chrome/browser/extensions/browser_event_router.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/extensions/browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
 namespace events = extensions::event_names;
 namespace tab_keys = extensions::tabs_constants;
 namespace page_actions_keys = extension_page_actions_api_constants;
 
 using content::NavigationController;
 using content::WebContents;
@@ skipping 84 matching lines @@
   registrar_.Add(
       this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
 
   // Observing NOTIFICATION_WEB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
   // a devtools WebContents that is opened in window, docked, then closed.
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::Source<WebContents>(contents));
+
+  registrar_.Add(this, chrome::NOTIFICATION_FAVICON_UPDATED,
+                 content::Source<WebContents>(contents));
 }
 
 void BrowserEventRouter::UnregisterForTabNotifications(WebContents* contents) {
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<NavigationController>(&contents->GetController()));
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::Source<WebContents>(contents));
+  registrar_.Remove(this, chrome::NOTIFICATION_FAVICON_UPDATED,
+      content::Source<WebContents>(contents));
 }
 
 void BrowserEventRouter::OnBrowserRemoved(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
 
   // Stop listening to TabStripModel events for this browser.
   browser->tab_strip_model()->RemoveObserver(this);
 }
 
@@ skipping 197 matching lines @@
 
   if (did_navigate)
     changed_properties.reset(entry->DidNavigate(contents));
   else
     changed_properties.reset(entry->UpdateLoadState(contents));
 
   if (changed_properties)
     DispatchTabUpdatedEvent(contents, changed_properties.Pass());
 }
 
+void BrowserEventRouter::FaviconUrlUpdated(
+    WebContents* contents,
+    bool* icon_url_changed) {
+    if (!icon_url_changed || !*icon_url_changed)

[pkotwicz, 2013/03/13 17:44:49]

Nit: 2 spaces of indent for the function body

[Timo Reimann, 2013/03/13 19:42:13]

Done.

+      return;
+    scoped_ptr<DictionaryValue> changed_properties(new DictionaryValue());

[pkotwicz, 2013/03/13 17:44:49]

Nit: Move the creation of |changed_properties| after checking
entry->GetFavicon().valid.

[Timo Reimann, 2013/03/13 19:42:13]

Done.

+    content::NavigationEntry* entry =
+      contents->GetController().GetActiveEntry();

[pkotwicz, 2013/03/13 17:44:49]

Nit: 4 spaces of indent for the wrapped line

[Timo Reimann, 2013/03/13 19:42:13]

Done.

+    if (!entry || !entry->GetFavicon().valid)
+      return;
+    changed_properties->SetString(tab_keys::kFaviconUrlKey,
+                                  entry->GetFavicon().url.spec());
+    DispatchTabUpdatedEvent(contents, changed_properties.Pass());
+}
+
 void BrowserEventRouter::DispatchEvent(
     Profile* profile,
     const char* event_name,
     scoped_ptr<ListValue> args,
     EventRouter::UserGestureState user_gesture) {
   if (!profile_->IsSameProfile(profile) ||
       !extensions::ExtensionSystem::Get(profile)->event_router())
     return;
 
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
@@ skipping 88 matching lines @@
   return &i->second;
 }
 
 void BrowserEventRouter::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         content::Source<NavigationController>(source).ptr();
     TabUpdated(source_controller->GetWebContents(), true);
+  } else if (type == chrome::NOTIFICATION_FAVICON_UPDATED) {
+    WebContents* contents = content::Source<WebContents>(source).ptr();
+    bool* icon_url_changed = content::Details<bool>(details).ptr();
+    FaviconUrlUpdated(contents, icon_url_changed);
   } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     // Tab was destroyed after being detached (without being re-attached).
     WebContents* contents = content::Source<WebContents>(source).ptr();
     registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<NavigationController>(&contents->GetController()));
     registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
         content::Source<WebContents>(contents));
+    registrar_.Remove(this, chrome::NOTIFICATION_FAVICON_UPDATED,
+        content::Source<WebContents>(contents));

[pkotwicz, 2013/03/13 17:44:49]

Style Nit: Check type == chrome::NOTIFICATION_FAVICON_UPDATED last to match the
order that we registered listening for the notifications. 

[Timo Reimann, 2013/03/13 19:42:13]

Done.

   } else {
     NOTREACHED();
   }
 }
 
 void BrowserEventRouter::TabChangedAt(WebContents* contents,
                                       int index,
                                       TabChangeType change_type) {
   TabUpdated(contents, false);
 }
@@ skipping 128 matching lines @@
 
     DispatchEventToExtension(profile,
                              extension_action.extension_id(),
                              event_name,
                              args.Pass(),
                              EventRouter::USER_GESTURE_ENABLED);
   }
 }
 
 }  // namespace extensions