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

ash/system/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.h"
 
 #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_views.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
@@ skipping 28 matching lines @@
       SetVisible(true);
     } else {
       SetVisible(false);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BluetoothDefaultView);
 };
 
-class BluetoothDetailedView : public views::View,
+class BluetoothDetailedView : public TrayDetailsView,
                               public ViewClickListener,
                               public views::ButtonListener {
  public:
   explicit BluetoothDetailedView(user::LoginStatus login)
       : login_(login),
-        header_(NULL),
         add_device_(NULL),
         toggle_bluetooth_(NULL) {
-    SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 0));
-    set_background(views::Background::CreateSolidBackground(kBackgroundColor));
-
     BluetoothDeviceList list;
     Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
     Update(list);
   }
 
   virtual ~BluetoothDetailedView() {}
 
   void Update(const BluetoothDeviceList& list) {
-    RemoveAllChildViews(true);
+    Reset();
 
-    header_ = NULL;
     add_device_ = NULL;
     toggle_bluetooth_ = NULL;
 
     AppendDeviceList(list);
     AppendSettingsEntries();
     AppendHeaderEntry();
 
     Layout();
   }
 
  private:
   void AppendHeaderEntry() {
-    header_ = new SpecialPopupRow();
-    header_->SetTextLabel(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
-    AddChildView(header_);
+    CreateSpecialRow(IDS_ASH_STATUS_TRAY_BLUETOOTH, this);
 
     if (login_ == user::LOGGED_IN_LOCKED)
       return;
 
     // Do not allow toggling bluetooth in the lock screen.
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     toggle_bluetooth_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED,
         IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED_HOVER,
         IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED_HOVER);
     toggle_bluetooth_->SetToggled(!delegate->GetBluetoothEnabled());
-    header_->AddButton(toggle_bluetooth_);
+    footer()->AddButton(toggle_bluetooth_);
   }
 
   void AppendDeviceList(const BluetoothDeviceList& list) {
-    views::View* devices = new views::View;
-    devices->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 1));
     device_map_.clear();
+    CreateScrollableList();
 
     for (size_t i = 0; i < list.size(); i++) {
       HoverHighlightView* container = new HoverHighlightView(this);
       container->set_fixed_height(kTrayPopupItemHeight);
       container->AddLabel(list[i].display_name,
           list[i].connected ? gfx::Font::BOLD : gfx::Font::NORMAL);
-      devices->AddChildView(container);
+      scroll_content()->AddChildView(container);
       device_map_[container] = list[i].address;
     }
-
-    FixedSizedScrollView* scroller = new FixedSizedScrollView;
-    scroller->set_border(views::Border::CreateSolidSidedBorder(1, 0, 1, 0,
-        SkColorSetARGB(25, 0, 0, 0)));
-    scroller->set_fixed_size(
-        gfx::Size(devices->GetPreferredSize().width() +
-                  scroller->GetScrollBarWidth(),
-                  kDeviceListHeight));
-    scroller->SetContentsView(devices);
-    AddChildView(scroller);
   }
 
   // Add settings entries.
   void AppendSettingsEntries() {
     // Add bluetooth device requires a browser window, hide it for non logged in
     // user.
     if (login_ == user::LOGGED_IN_NONE ||
         login_ == user::LOGGED_IN_LOCKED)
       return;
 
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     HoverHighlightView* container = new HoverHighlightView(this);
     container->set_fixed_height(kTrayPopupItemHeight);
     container->AddLabel(rb.GetLocalizedString(
         IDS_ASH_STATUS_TRAY_BLUETOOTH_ADD_DEVICE), gfx::Font::NORMAL);
     container->SetEnabled(delegate->GetBluetoothEnabled());
     AddChildView(container);
     add_device_ = container;
   }
 
   // Overridden from ViewClickListener.
   virtual void ClickedOn(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::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 == add_device_) {
       delegate->AddBluetoothDevice();
     } else {
       std::map<views::View*, std::string>::iterator find;
       find = device_map_.find(sender);
       if (find != device_map_.end()) {
         std::string device_id = find->second;
         delegate->ToggleBluetoothConnection(device_id);
       }
     }
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> device_map_;
-  SpecialPopupRow* header_;
   views::View* add_device_;
   TrayPopupHeaderButton* toggle_bluetooth_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDetailedView);
 };
 
 }  // namespace tray
 
 TrayBluetooth::TrayBluetooth()
@@ skipping 40 matching lines @@
   BluetoothDeviceList list;
   Shell::GetInstance()->tray_delegate()->GetAvailableBluetoothDevices(&list);
   if (default_)
     default_->UpdateLabel();
   else if (detailed_)
     detailed_->Update(list);
 }
 
 }  // namespace internal
 }  // namespace ash