[Mac] DownloadShelf should be notified when autoclosing.

chrome/browser/ui/views/download/download_shelf_view.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/ui/views/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 76 matching lines @@
 
 int CenterPosition(int size, int target_size) {
   return std::max((target_size - size) / 2, kTopBottomPadding);
 }
 
 }  // namespace
 
 DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
     : browser_(browser),
       parent_(parent),
-      auto_closed_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           mouse_watcher_(new views::MouseWatcherViewHost(this, gfx::Insets()),
                          this)) {
   mouse_watcher_.set_notify_on_exit_time(
       base::TimeDelta::FromMilliseconds(kNotifyOnExitTimeMS));
   set_id(VIEW_ID_DOWNLOAD_SHELF);
   parent->AddChildView(this);
 }
 
 DownloadShelfView::~DownloadShelfView() {
@@ skipping 12 matching lines @@
   new_item_animation_->Reset();
   new_item_animation_->Show();
 }
 
 void DownloadShelfView::DoAddDownload(DownloadItem* download) {
   DownloadItemView* view = new DownloadItemView(download, this);
   AddDownloadView(view);
 }
 
 void DownloadShelfView::MouseMovedOutOfHost() {
-  Close();
+  Close(AUTOMATIC);
 }
 
 void DownloadShelfView::OnWillChangeFocus(views::View* focused_before,
                                           views::View* focused_now) {
   SchedulePaintForDownloadItem(focused_before);
   SchedulePaintForDownloadItem(focused_now);
 }
 
 void DownloadShelfView::OnDidChangeFocus(views::View* focused_before,
                                          views::View* focused_now) {
   AccessiblePaneView::OnDidChangeFocus(focused_before, focused_now);
 }
 
 void DownloadShelfView::RemoveDownloadView(View* view) {
   DCHECK(view);
   std::vector<DownloadItemView*>::iterator i =
       find(download_views_.begin(), download_views_.end(), view);
   DCHECK(i != download_views_.end());
   download_views_.erase(i);
   RemoveChildView(view);
   delete view;
   if (download_views_.empty())
-    Close();
+    Close(AUTOMATIC);
   else if (CanAutoClose())
     mouse_watcher_.Start();
   Layout();
   SchedulePaint();
 }
 
 views::View* DownloadShelfView::GetDefaultFocusableChild() {
   return download_views_.empty() ?
       static_cast<View*>(show_all_view_) : download_views_[0];
 }
@@ skipping 214 matching lines @@
 void DownloadShelfView::OnThemeChanged() {
   UpdateColorsFromTheme();
 }
 
 void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) {
   chrome::ShowDownloads(browser_);
 }
 
 void DownloadShelfView::ButtonPressed(
     views::Button* button, const ui::Event& event) {
-  auto_closed_ = false;
-  Close();
+  Close(USER_ACTION);
 }
 
 bool DownloadShelfView::IsShowing() const {
   return shelf_animation_->IsShowing();
 }
 
 bool DownloadShelfView::IsClosing() const {
   return shelf_animation_->IsClosing();
 }
 
 void DownloadShelfView::DoShow() {
   shelf_animation_->Show();
 }
 
-void DownloadShelfView::DoClose() {
+void DownloadShelfView::DoClose(CloseReason reason) {
   int num_in_progress = 0;
   for (size_t i = 0; i < download_views_.size(); ++i) {
     if (download_views_[i]->download()->IsInProgress())
       ++num_in_progress;
   }
-  download_util::RecordShelfClose(
-      download_views_.size(), num_in_progress, auto_closed_);
+  download_util::RecordShelfClose(download_views_.size(),
+                                  num_in_progress,
+                                  (reason == AUTOMATIC));

[Nico, 2013/03/22 20:24:11]

ditto

[asanka, 2013/03/22 21:22:13]

Done.

   parent_->SetDownloadShelfVisible(false);
   shelf_animation_->Hide();
-  auto_closed_ = true;
 }
 
 Browser* DownloadShelfView::browser() const {
   return browser_;
 }
 
 void DownloadShelfView::Closed() {
   // Don't remove completed downloads if the shelf is just being auto-hidden
   // rather than explicitly closed by the user.
   if (is_hidden())
@@ skipping 48 matching lines @@
     const DownloadItemView* download_item_view) {
   gfx::Rect bounds = download_item_view->bounds();
 
 #if defined(TOOLKIT_VIEWS)
   bounds.set_height(bounds.height() - 1);
   bounds.Offset(0, 3);
 #endif
 
   return bounds;
 }