mac: attempt to fix a startup perf regression after r174653

chrome/browser/ui/cocoa/image_button_cell.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 CHROME_BROWSER_UI_COCOA_IMAGE_BUTTON_CELL_H_
 #define CHROME_BROWSER_UI_COCOA_IMAGE_BUTTON_CELL_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 
 namespace image_button_cell {
 
 // Possible states
 enum ButtonState {
   kDefaultState = 0,
   kHoverState,
   kPressedState,
   kDisabledState,
   // The same as above, but for non-main, non-key windows.
   kDefaultStateBackground,
   kHoverStateBackground,
   kButtonStateCount
 };
 
+enum ImageType {

[sail, 2013/01/04 05:27:24]

It doesn't seem like you actually need this.

image_[].image is only non-nil if ImageType is kImageId.

[Nico, 2013/01/04 05:52:55]

Thanks, this makes things slightly better. Done.

+  kImageId,
+  kImage,
+};
+
 } // namespace ImageButtonCell
 
 @protocol ImageButton
 @optional
 // Sent from an ImageButtonCell to its view when the mouse enters or exits the
 // cell.
 - (void)mouseInsideStateDidChange:(BOOL)isInside;
 @end
 
 // A button cell that can disable a different image for each possible button
 // state. Images are specified by image IDs.
 @interface ImageButtonCell : NSButtonCell {
  @private
-  scoped_nsobject<NSImage> image_[image_button_cell::kButtonStateCount];
+  struct {
+    image_button_cell::ImageType type;
+    int imageId;
+    scoped_nsobject<NSImage> image;
+  } image_[image_button_cell::kButtonStateCount];
   NSInteger overlayImageID_;
   BOOL isMouseInside_;
 }
 
 @property(assign, nonatomic) NSInteger overlayImageID;
 @property(assign, nonatomic) BOOL isMouseInside;
 
 // Sets the image for the given button state using an image ID.
-// The image will be loaded from a resource pak.
+// The image will be lazy loaded from a resource pak -- important because
+// this is in the hot path for startup.
 - (void)setImageID:(NSInteger)imageID
     forButtonState:(image_button_cell::ButtonState)state;
 
 // Sets the image for the given button state using an image.
 - (void)setImage:(NSImage*)image
   forButtonState:(image_button_cell::ButtonState)state;
 
 @end
 
 #endif // CHROME_BROWSER_UI_COCOA_IMAGE_BUTTON_CELL_H_