ash: Make the rows in IME and bluetooth tray-popups larger.

ash/system/network/tray_network.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/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 68 matching lines @@
   virtual ~NonActivatableSettingsBubble() {}
 
   virtual bool CanActivate() const OVERRIDE {
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NonActivatableSettingsBubble);
 };
 
-// A ToggleImageButton with fixed size, paddings and hover effects. These
-// buttons are used in the header.
-class HeaderButton : public views::ToggleImageButton {
- public:
-  HeaderButton(views::ButtonListener* listener,
-               int enabled_resource_id,
-               int disabled_resource_id)
-      : views::ToggleImageButton(listener) {
-    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-    SetImage(views::CustomButton::BS_NORMAL,
-        bundle.GetImageNamed(enabled_resource_id).ToSkBitmap());
-    SetToggledImage(views::CustomButton::BS_NORMAL,
-        bundle.GetImageNamed(disabled_resource_id).ToSkBitmap());
-    SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                      views::ImageButton::ALIGN_MIDDLE);
-    set_background(views::Background::CreateSolidBackground(
-        ash::kHeaderBackgroundColor));
-  }
-
-  virtual ~HeaderButton() {}
-
- private:
-  // Overridden from views::View.
-  virtual gfx::Size GetPreferredSize() OVERRIDE {
-    return gfx::Size(ash::kTrayPopupItemHeight, ash::kTrayPopupItemHeight);
-  }
-
-  virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE {
-    // Left border.
-    canvas->FillRect(gfx::Rect(0, 0, 1, height()), ash::kBorderDarkColor);
-  }
-
-  // Overridden from views::CustomButton.
-  virtual void StateChanged() OVERRIDE {
-    set_background(views::Background::CreateSolidBackground(
-        IsHotTracked() ? ash::kHeaderHoverBackgroundColor :
-                         ash::kHeaderBackgroundColor));
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(HeaderButton);
-};
-
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 enum ColorTheme {
   LIGHT,
   DARK,
@@ skipping 127 matching lines @@
     AddChildView(header_);
   }
 
   void AppendHeaderButtons() {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
 
     header_buttons_ = new views::View;
     header_buttons_->SetLayoutManager(new
         views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
-    button_wifi_ = new HeaderButton(this,
+    button_wifi_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_WIFI_ENABLED,
         IDR_AURA_UBER_TRAY_WIFI_DISABLED);
     button_wifi_->SetToggled(!delegate->GetWifiEnabled());
     header_buttons_->AddChildView(button_wifi_);
 
     if (delegate->GetCellularAvailable()) {
-      button_cellular_ = new HeaderButton(this,
+      button_cellular_ = new TrayPopupHeaderButton(this,
           IDR_AURA_UBER_TRAY_CELLULAR_ENABLED,
           IDR_AURA_UBER_TRAY_CELLULAR_DISABLED);
       button_cellular_->SetToggled(!delegate->GetCellularEnabled());
       header_buttons_->AddChildView(button_cellular_);
     }
 
-    info_icon_ = new HeaderButton(this,
+    info_icon_ = new TrayPopupHeaderButton(this,
         IDR_AURA_UBER_TRAY_NETWORK_INFO,
         IDR_AURA_UBER_TRAY_NETWORK_INFO);
     header_buttons_->AddChildView(info_icon_);
 
     header_->AddChildView(header_buttons_);
   }
 
   void AppendNetworkEntries() {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     std::vector<NetworkIconInfo> list;
@@ skipping 263 matching lines @@
   if (tray_.get())
     tray_->Update(info);
   if (default_.get())
     default_->Update();
   if (detailed_.get())
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash