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

ash/system/ime/tray_ime.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/ime/tray_ime.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/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
@@ skipping 24 matching lines @@
 
   void UpdateLabel(const IMEInfo& info) {
     SetLabel(info.name);
     SetAccessibleName(info.name);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
 };
 
-class IMEDetailedView : public views::View,
+class IMEDetailedView : public TrayDetailsView,
                         public ViewClickListener {
  public:
   IMEDetailedView(SystemTrayItem* owner, user::LoginStatus login)
-      : login_(login),
-        header_(NULL) {
-    SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 0));
-    set_background(views::Background::CreateSolidBackground(kBackgroundColor));
+      : login_(login) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     IMEInfoList list;
     delegate->GetAvailableIMEList(&list);
     IMEPropertyInfoList property_list;
     delegate->GetCurrentIMEProperties(&property_list);
     Update(list, property_list);
   }
 
   virtual ~IMEDetailedView() {}
 
   void Update(const IMEInfoList& list,
               const IMEPropertyInfoList& property_list) {
-    RemoveAllChildViews(true);
-
-    header_ = NULL;
+    Reset();
 
     AppendIMEList(list);
     if (!property_list.empty())
       AppendIMEProperties(property_list);
     if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED)
       AppendSettings();
     AppendHeaderEntry();
 
     Layout();
     SchedulePaint();
   }
 
  private:
   void AppendHeaderEntry() {
-    header_ = new SpecialPopupRow();
-    header_->SetTextLabel(IDS_ASH_STATUS_TRAY_IME, this);
-    AddChildView(header_);
+    CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this);
   }
 
   void AppendIMEList(const IMEInfoList& list) {
     ime_map_.clear();
-    views::View* imes = new views::View;
-    imes->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 0, 0, 1));
+    CreateScrollableList();
     for (size_t i = 0; i < list.size(); i++) {
       HoverHighlightView* container = new HoverHighlightView(this);
       container->set_fixed_height(kTrayPopupItemHeight);
       container->AddLabel(list[i].name,
           list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL);
-      imes->AddChildView(container);
+      scroll_content()->AddChildView(container);
       ime_map_[container] = list[i].id;
     }
-    imes->set_border(views::Border::CreateSolidSidedBorder(1, 0, 1, 0,
-        kBorderLightColor));
-    AddChildView(imes);
   }
 
   void AppendIMEProperties(const IMEPropertyInfoList& property_list) {
     property_map_.clear();
     views::View* properties = new views::View;
     properties->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 1));
     for (size_t i = 0; i < property_list.size(); i++) {
       HoverHighlightView* container = new HoverHighlightView(this);
       container->set_fixed_height(kTrayPopupItemHeight);
@@ skipping 14 matching lines @@
     container->AddLabel(ui::ResourceBundle::GetSharedInstance().
         GetLocalizedString(IDS_ASH_STATUS_TRAY_IME_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->ShowIMESettings();
     } else {
       std::map<views::View*, std::string>::const_iterator ime_find;
       ime_find = ime_map_.find(sender);
       if (ime_find != ime_map_.end()) {
         std::string ime_id = ime_find->second;
         delegate->SwitchIME(ime_id);
         GetWidget()->Close();
       } else {
         std::map<views::View*, std::string>::const_iterator prop_find;
         prop_find = property_map_.find(sender);
         if (prop_find != property_map_.end()) {
           const std::string key = prop_find->second;
           delegate->ActivateIMEProperty(key);
           GetWidget()->Close();
         }
       }
     }
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, std::string> property_map_;
-  SpecialPopupRow* header_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
 
 TrayIME::TrayIME()
     : tray_label_(NULL),
       default_(NULL),
@@ skipping 66 matching lines @@
   UpdateTrayLabel(current, list.size());
 
   if (default_)
     default_->UpdateLabel(current);
   if (detailed_)
     detailed_->Update(list, property_list);
 }
 
 }  // namespace internal
 }  // namespace ash