ash: Make sure all the sub-popups retain the same height as the main popup.

ash/system/drive/tray_drive.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 "ash/system/drive/tray_drive.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/stl_util.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 56 matching lines @@
     DCHECK(list);
     string16 label = GetTrayLabel(*list);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DriveDefaultView);
 };
 
-class DriveDetailedView : public views::View,
+class DriveDetailedView : public TrayDetailsView,
                           public ViewClickListener {
  public:
   DriveDetailedView(SystemTrayItem* owner,
                     const DriveOperationStatusList* list)
-      : header_(NULL),
-        operations_(NULL),
-        settings_(NULL),
+      : settings_(NULL),
         in_progress_img_(NULL),
         done_img_(NULL),
         failed_img_(NULL) {
-    SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 0));
-    set_background(views::Background::CreateSolidBackground(kBackgroundColor));
-
     in_progress_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_AURA_UBER_TRAY_DRIVE);
     done_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_AURA_UBER_TRAY_DRIVE_DONE);
     failed_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_AURA_UBER_TRAY_DRIVE_FAILED);
 
     Update(list);
   }
 
@@ skipping 145 matching lines @@
     views::ImageView* status_img_;
     views::View* label_container_;
     views::ProgressBar* progress_bar_;
     views::ImageButton* cancel_button_;
     FilePath file_path_;
 
     DISALLOW_COPY_AND_ASSIGN(RowView);
   };
 
   void AppendHeaderEntry(const DriveOperationStatusList* list) {
-    if (header_)
+    if (footer())
       return;
-    header_ = new SpecialPopupRow();
-    header_->SetTextLabel(IDS_ASH_STATUS_TRAY_DRIVE, this);
-    AddChildView(header_);
+    CreateSpecialRow(IDS_ASH_STATUS_TRAY_DRIVE, this);
   }
 
   SkBitmap* GetImageForState(ash::DriveOperationStatus::OperationState state) {
     switch (state) {
       case ash::DriveOperationStatus::OPERATION_NOT_STARTED:
       case ash::DriveOperationStatus::OPERATION_STARTED:
       case ash::DriveOperationStatus::OPERATION_IN_PROGRESS:
       case ash::DriveOperationStatus::OPERATION_SUSPENDED:
         return in_progress_img_;
       case ash::DriveOperationStatus::OPERATION_COMPLETED:
         return done_img_;
       case ash::DriveOperationStatus::OPERATION_FAILED:
         return failed_img_;
     }
     return failed_img_;
   }
 
   virtual void OnCancelOperation(const FilePath& file_path) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     delegate->CancelDriveOperation(file_path);
   }
 
   void AppendOperationList(const DriveOperationStatusList* list) {
-    if (!operations_) {
-      operations_ = new views::View;
-      operations_->SetLayoutManager(new views::BoxLayout(
-          views::BoxLayout::kVertical, 0, 0, 1));
-      AddChildView(operations_);
-    }
+    if (!scroller())
+      CreateScrollableList();
 
     // Apply the update.
     std::set<FilePath> new_set;
     for (DriveOperationStatusList::const_iterator it = list->begin();
          it != list->end(); ++it) {
       const DriveOperationStatus& operation = *it;
 
       new_set.insert(operation.file_path);
       std::map<FilePath, RowView*>::iterator existing_item =
           update_map_.find(operation.file_path);
 
       if (existing_item != update_map_.end()) {
         existing_item->second->UpdateStatus(operation.state,
                                             operation.progress);
       } else {
         RowView* row_view = new RowView(this,
                                         operation.state,
                                         operation.progress,
                                         operation.file_path);
 
         update_map_[operation.file_path] = row_view;
-        operations_->AddChildView(row_view);
+        scroll_content()->AddChildView(row_view);
       }
     }
 
     // Remove items from the list that haven't been added or modified with this
     // update batch.
     std::set<FilePath> remove_set;
     for (std::map<FilePath, RowView*>::iterator update_iter =
              update_map_.begin();
          update_iter != update_map_.end(); ++update_iter) {
       if (new_set.find(update_iter->first) == new_set.end()) {
@@ skipping 21 matching lines @@
     container->AddLabel(ui::ResourceBundle::GetSharedInstance().
         GetLocalizedString(IDS_ASH_STATUS_TRAY_DRIVE_SETTINGS),
         gfx::Font::NORMAL);
     AddChildView(container);
     settings_ = container;
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
-    if (sender == header_->content()) {
-      Shell::GetInstance()->tray()->ShowDefaultView();
+    if (sender == footer()->content()) {
+      Shell::GetInstance()->tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
     } else if (sender == settings_) {
       delegate->ShowDriveSettings();
     }
   }
 
   // Maps operation entries to their file paths.
   std::map<FilePath, RowView*> update_map_;
-  SpecialPopupRow* header_;
-  views::View* operations_;
   views::View* settings_;
   SkBitmap* in_progress_img_;
   SkBitmap* done_img_;
   SkBitmap* failed_img_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveDetailedView);
 };
 
 }  // namespace tray
 
@@ skipping 62 matching lines @@
 
   if (default_)
     default_->Update(&list);
 
   if (detailed_)
     detailed_->Update(&list);
 }
 
 }  // namespace internal
 }  // namespace ash