Check the favicon and loading state when a tab is created in case its TabCont...

chrome/browser/cocoa/tab_strip_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 34 matching lines @@
 - (BOOL)mouseDownCanMoveWindow {return NO;}
 - (void)drawRect:(NSRect)rect {}
 @end
 
 @interface TabStripController(Private)
 - (void)installTrackingArea;
 - (BOOL)useFullWidthForLayout;
 - (void)addSubviewToPermanentList:(NSView*)aView;
 - (void)regenerateSubviewList;
 - (NSInteger)indexForContentsView:(NSView*)view;
+- (void)updateFavIconForContents:(TabContents*)contents
+                         atIndex:(NSInteger)index;
 @end
 
 @implementation TabStripController
 
 - (id)initWithView:(TabStripView*)view
         switchView:(NSView*)switchView
            browser:(Browser*)browser {
   DCHECK(view && switchView && browser);
   if ((self = [super init])) {
     tabView_ = view;
@@ skipping 420 matching lines @@
   // for layout.
   availableResizeWidth_ = kUseFullAvailableWidth;
 
   // We don't need to call |-layoutTabs| if the tab will be in the foreground
   // because it will get called when the new tab is selected by the tab model.
   // Whenever |-layoutTabs| is called, it'll also add the new subview.
   if (!inForeground) {
     [self layoutTabs];
   }
 
+  // During normal loading, we won't yet have a favicon and we'll get
+  // subsequent state change notifications to show the throbber, but when we're
+  // dragging a tab out into a new window, we have to put the tab's favicon
+  // into the right state up front as we won't be told to do it from anywhere
+  // else.
+  [self updateFavIconForContents:contents atIndex:index];
+
   // Send a broadcast that the number of tabs have changed.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kTabStripNumberOfTabsChanged
                     object:self];
 }
 
 // Called when a notification is received from the model to select a particular
 // tab. Swaps in the toolbar and content area associated with |newContents|.
 - (void)selectTabWithContents:(TabContents*)newContents
              previousContents:(TabContents*)oldContents
@@ skipping 86 matching lines @@
     NSBundle* bundle = mac_util::MainAppBundle();
     image = [[NSImage alloc] initByReferencingFile:
              [bundle pathForResource:@"nav" ofType:@"pdf"]];
     [image autorelease];
   }
 
   [view setImage:image];
   return view;
 }
 
+// Update the current loading state, replacing the favicon with a throbber, or
+// vice versa. This will get called repeatedly with the same state during a
+// load, so we need to make sure we're not creating the throbber view over and
+// over. However, when the page is done, every state change is important.
+- (void)updateFavIconForContents:(TabContents*)contents
+                         atIndex:(NSInteger)index {
+  static NSImage* throbberWaitingImage =
+      [nsimage_cache::ImageNamed(@"throbber_waiting.png") retain];
+  static NSImage* throbberLoadingImage =
+      [nsimage_cache::ImageNamed(@"throbber.png") retain];
+  static NSImage* sadFaviconImage =
+      [nsimage_cache::ImageNamed(@"sadfavicon.png") retain];
+
+  if (!contents) return;

[Mark Mentovai, 2009/08/19 20:43:28]

I'd put the return on a line by itself.

I'd put it before the NSImages, too.

+
+  TabController* tabController = [tabArray_ objectAtIndex:index];
+  TabLoadingState oldState = [tabController loadingState];
+
+  TabLoadingState newState = kTabDone;
+  NSImage* throbberImage = nil;
+  if (contents->waiting_for_response()) {
+    newState = kTabWaiting;
+    throbberImage = throbberWaitingImage;
+  } else if (contents->is_loading()) {
+    newState = kTabLoading;
+    throbberImage = throbberLoadingImage;
+  } else if (contents->is_crashed()) {
+    newState = kTabCrashed;
+  }
+
+  if (oldState != newState || newState == kTabDone) {
+    NSView* iconView = nil;
+    if (newState == kTabDone) {
+      iconView = [self favIconImageViewForContents:contents];
+    } else if (newState == kTabCrashed) {
+      NSImage* oldImage = [[self favIconImageViewForContents:contents] image];
+      NSRect frame = NSMakeRect(0, 0, 16, 16);
+      iconView = [ThrobberView toastThrobberViewWithFrame:frame
+                                              beforeImage:oldImage
+                                               afterImage:sadFaviconImage];
+    } else {
+      NSRect frame = NSMakeRect(0, 0, 16, 16);
+      iconView = [ThrobberView filmstripThrobberViewWithFrame:frame
+                                                        image:throbberImage];
+    }
+
+    [tabController setLoadingState:newState];
+    [tabController setIconView:iconView];
+  }
+}
+
 // Called when a notification is received from the model that the given tab
 // has been updated. |loading| will be YES when we only want to update the
 // throbber state, not anything else about the (partially) loading tab.
 - (void)tabChangedWithContents:(TabContents*)contents
                        atIndex:(NSInteger)index
                    loadingOnly:(BOOL)loading {
   if (!loading)
     [self setTabTitle:[tabArray_ objectAtIndex:index] withContents:contents];
 
-  // Update the current loading state, replacing the icon with a throbber, or
-  // vice versa. This will get called repeatedly with the same state during a
-  // load, so we need to make sure we're not creating the throbber view over and
-  // over. However, when the page is done, every state change is important.
-  if (contents) {
-    static NSImage* throbberWaitingImage =
-        [nsimage_cache::ImageNamed(@"throbber_waiting.png") retain];
-    static NSImage* throbberLoadingImage =
-        [nsimage_cache::ImageNamed(@"throbber.png") retain];
-    static NSImage* sadFaviconImage =
-        [nsimage_cache::ImageNamed(@"sadfavicon.png") retain];
-
-    TabController* tabController = [tabArray_ objectAtIndex:index];
-
-    TabLoadingState oldState = [tabController loadingState];
-
-    TabLoadingState newState = kTabDone;
-    NSImage* throbberImage = nil;
-    if (contents->waiting_for_response()) {
-      newState = kTabWaiting;
-      throbberImage = throbberWaitingImage;
-    } else if (contents->is_loading()) {
-      newState = kTabLoading;
-      throbberImage = throbberLoadingImage;
-    } else if (contents->is_crashed()) {
-      newState = kTabCrashed;
-    }
-
-    if (oldState != newState || newState == kTabDone) {
-      NSView* iconView = nil;
-      if (newState == kTabDone) {
-        iconView = [self favIconImageViewForContents:contents];
-      } else if (newState == kTabCrashed) {
-        NSImage* oldImage = [[self favIconImageViewForContents:contents] image];
-        NSRect frame = NSMakeRect(0, 0, 16, 16);
-        iconView = [ThrobberView toastThrobberViewWithFrame:frame
-                                                beforeImage:oldImage
-                                                 afterImage:sadFaviconImage];
-      } else {
-        NSRect frame = NSMakeRect(0, 0, 16, 16);
-        iconView = [ThrobberView filmstripThrobberViewWithFrame:frame
-                                                          image:throbberImage];
-      }
-
-      [tabController setLoadingState:newState];
-      [tabController setIconView:iconView];
-    }
-  }
+  [self updateFavIconForContents:contents atIndex:index];
 
   TabContentsController* updatedController =
       [tabContentsArray_ objectAtIndex:index];
   [updatedController tabDidChange:contents];
 }
 
 // Called when a tab is moved (usually by drag&drop). Keep our parallel arrays
 // in sync with the tab strip model.
 - (void)tabMovedWithContents:(TabContents*)contents
                     fromIndex:(NSInteger)from
@@ skipping 210 matching lines @@
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:YES];
   }
 }
 
 
 @end