[Mac] Re-layout download shelf when danger state of item changes.

chrome/browser/ui/cocoa/download/download_item_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
@@ skipping 67 matching lines @@
                               content::PageNavigator* navigator)
       : DownloadShelfContextMenu(downloadItem, navigator) { }
 
   // DownloadShelfContextMenu::GetMenuModel is protected.
   using DownloadShelfContextMenu::GetMenuModel;
 };
 
 @interface DownloadItemController (Private)
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 - (void)updateTheme:(ui::ThemeProvider*)themeProvider;
-- (void)setState:(DownoadItemState)state;
+- (void)setState:(DownloadItemState)state;
+- (void)initExperienceSamplingEvent:(const char*)event;
+- (void)updateExperienceSamplingEvent:(const char*)event;
 @end
 
 // Implementation of DownloadItemController
 
 @implementation DownloadItemController
 
 - (id)initWithDownload:(DownloadItem*)downloadItem
                  shelf:(DownloadShelfController*)shelf
              navigator:(content::PageNavigator*)navigator {
   if ((self = [super initWithNibName:@"DownloadItem"
@@ skipping 12 matching lines @@
     state_ = kNormal;
     creationTime_ = base::Time::Now();
     font_list_.reset(new gfx::FontList(
         ui::ResourceBundle::GetSharedInstance().GetFontList(
             ui::ResourceBundle::BaseFont)));
   }
   return self;
 }
 
 - (void)dealloc {
-  if (sampling_event_.get())
-    sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kIgnore);
+  [self updateExperienceSamplingEvent:ExperienceSamplingEvent::kIgnore];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [progressView_ setController:nil];
   [[self view] removeFromSuperview];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   [progressView_ setController:self];
 
   GTMUILocalizerAndLayoutTweaker* localizerAndLayoutTweaker =
       [[[GTMUILocalizerAndLayoutTweaker alloc] init] autorelease];
   [localizerAndLayoutTweaker applyLocalizer:localizer_ tweakingUI:[self view]];
 
   [self setStateFromDownload:bridge_->download_model()];
 
   bridge_->LoadIcon();
   [self updateToolTip];
 }
 
 - (void)showDangerousWarning:(DownloadItemModel*)downloadModel {
   // The transition from safe -> dangerous should only happen once. The code
   // assumes that the danger type of the download doesn't change once it's set.
   if ([self isDangerousMode])
     return;
 
   [self setState:kDangerous];
 
   // ExperienceSampling: Dangerous or malicious download warning is being shown
   // to the user, so we start a new SamplingEvent and track it.
-  std::string event_name = downloadModel->MightBeMalicious()
+  const char* event_name = downloadModel->MightBeMalicious()
                                ? ExperienceSamplingEvent::kMaliciousDownload
                                : ExperienceSamplingEvent::kDangerousDownload;
-  sampling_event_.reset(new ExperienceSamplingEvent(
-      event_name,
-      downloadModel->download()->GetURL(),
-      downloadModel->download()->GetReferrerUrl(),
-      downloadModel->download()->GetBrowserContext()));
+  [self updateExperienceSamplingEvent:event_name];
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   NSImage* alertIcon;
 
   NSString* dangerousWarning = base::SysUTF16ToNSString(
       downloadModel->GetWarningText(*font_list_, kTextWidth));
   DCHECK(dangerousWarning);
   [dangerousDownloadLabel_ setStringValue:dangerousWarning];
   CGFloat labelWidthChange =
       [GTMUILocalizerAndLayoutTweaker
@@ skipping 33 matching lines @@
     NSPoint frameOrigin = [dangerousButtonTweaker_ frame].origin;
     frameOrigin.x += labelWidthChange;
     [dangerousButtonTweaker_ setFrameOrigin:frameOrigin];
 
     [dangerousButtonTweaker_ setHidden:NO];
     [maliciousButtonTweaker_ setHidden:YES];
   }
   DCHECK(alertIcon);
   [image_ setImage:alertIcon];
 
-  // Grow the parent views
-  WidenView([self view], labelWidthChange + buttonWidthChange);
   WidenView(dangerousDownloadView_, labelWidthChange + buttonWidthChange);
+  [shelf_ layoutItems];
 }
 
 - (void)setStateFromDownload:(DownloadItemModel*)downloadModel {
   DCHECK_EQ([self download], downloadModel->download());
 
   // Handle dangerous downloads.
   if (downloadModel->IsDangerous()) {
     [self showDangerousWarning:downloadModel];
     return;
   }
 
   // Set path to draggable download on completion.
   if (downloadModel->download()->GetState() == DownloadItem::COMPLETE)
     [progressView_ setDownload:downloadModel->download()->GetTargetFilePath()];
 
   [cell_ setStateFromDownload:downloadModel];
 }
 
 - (void)setIcon:(NSImage*)icon {
   [cell_ setImage:icon];
 }
 
 - (void)remove {
   // We are deleted after this!
+  // If the download is destroyed before DownloadItemController, then we'd end
+  // up here. Reset the bridege_ so  that it can clean up after itself before
+  // the DownloadItemController is deallocd.
+  bridge_.reset();
   [shelf_ remove:self];
 }
 
 - (void)updateVisibility:(id)sender {
   if ([[self view] window])
     [self updateTheme:[[[self view] window] themeProvider]];
 
   NSView* view = [self view];
   NSRect containerFrame = [[view superview] frame];
   [view setHidden:(NSMaxX([view frame]) > NSWidth(containerFrame))];
@@ skipping 40 matching lines @@
   // The state change hide the dangerouse download view and is now showing the
   // download progress view.  This means the view is likely to be a different
   // size, so trigger a shelf layout to fix up spacing.
   [shelf_ layoutItems];
 }
 
 - (BOOL)isDangerousMode {
   return state_ == kDangerous;
 }
 
-- (void)setState:(DownoadItemState)state {
+- (void)setState:(DownloadItemState)state {
   if (state_ == state)
     return;
   state_ = state;
   if (state_ == kNormal) {
     [progressView_ setHidden:NO];
     [dangerousDownloadView_ setHidden:YES];
   } else {
     DCHECK_EQ(kDangerous, state_);
     [progressView_ setHidden:YES];
     [dangerousDownloadView_ setHidden:NO];
@@ skipping 11 matching lines @@
 // Adapt appearance to the current theme. Called after theme changes and before
 // this is shown for the first time.
 - (void)updateTheme:(ui::ThemeProvider*)themeProvider {
   if (!themeProvider)
     return;
 
   NSColor* color = themeProvider->GetNSColor(ThemeProperties::COLOR_TAB_TEXT);
   [dangerousDownloadLabel_ setTextColor:color];
 }
 
+- (void)initExperienceSamplingEvent:(const char*)event {
+  sampling_event_.reset(new ExperienceSamplingEvent(
+      event,
+      bridge_->download_model()->download()->GetURL(),
+      bridge_->download_model()->download()->GetReferrerUrl(),
+      bridge_->download_model()->download()->GetBrowserContext()));
+}
+
+- (void)updateExperienceSamplingEvent:(const char*)event {
+  if (sampling_event_.get()) {
+    sampling_event_->CreateUserDecisionEvent(event);
+    sampling_event_.reset(NULL);
+  }
+}
+
 - (IBAction)saveDownload:(id)sender {
   // The user has confirmed a dangerous download.  We record how quickly the
   // user did this to detect whether we're being clickjacked.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creationTime_);
   // ExperienceSampling: User chose to proceed with dangerous download.
-  if (sampling_event_.get()) {
-    sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kProceed);
-    sampling_event_.reset(NULL);
-  }
+  [self updateExperienceSamplingEvent:ExperienceSamplingEvent::kProceed];
   // This will change the state and notify us.
   bridge_->download_model()->download()->ValidateDangerousDownload();
 }
 
 - (IBAction)discardDownload:(id)sender {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creationTime_);
   DownloadItem* download = bridge_->download_model()->download();
   download->Remove();
   // WARNING: we are deleted at this point.  Don't access 'this'.
 }
 
 - (IBAction)dismissMaliciousDownload:(id)sender {
   // ExperienceSampling: User dismissed the dangerous download.
-  if (sampling_event_.get()) {
-    sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kDeny);
-    sampling_event_.reset(NULL);
-  }
+  [self updateExperienceSamplingEvent:ExperienceSamplingEvent::kDeny];
   [self remove];
   // WARNING: we are deleted at this point.
 }
 
 - (IBAction)showContextMenu:(id)sender {
   base::scoped_nsobject<DownloadShelfContextMenuController> menuController(
       [[DownloadShelfContextMenuController alloc]
         initWithItemController:self
                   withDelegate:nil]);
   [NSMenu popUpContextMenu:[menuController menu]
                  withEvent:[NSApp currentEvent]
                    forView:[self view]];
 }
 
 @end