ash: Add a bluetooth entry in the uber tray.

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/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_item_more.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"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 31 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FixedWidthImageView);
 };
 
 class ViewClickListener {
  public:
   virtual ~ViewClickListener() {}
   virtual void ClickedOn(views::View* sender) = 0;
 };
 
-class HoverHighlightView : public views::View {
+class HoverHighlightView : public ash::internal::TrayItemMore {
  public:
   explicit HoverHighlightView(ViewClickListener* listener)
       : listener_(listener) {
     set_notify_enter_exit_on_child(true);
   }
 
   virtual ~HoverHighlightView() {}
 
   // Convenience function for adding an icon and a label.
   void AddIconAndLabel(const SkBitmap& image,
                        const string16& text,
                        gfx::Font::FontStyle style) {
     SetLayoutManager(new views::BoxLayout(
           views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
     views::ImageView* image_view = new FixedWidthImageView;
     image_view->SetImage(image);
     AddChildView(image_view);
 
     views::Label* label = new views::Label(text);
     label->SetFont(label->font().DeriveFont(0, style));
     AddChildView(label);
+
+    AddMore();
   }
 
   void AddLabel(const string16& text) {
     SetLayoutManager(new views::FillLayout());
     views::Label* label = new views::Label(text);
     label->set_border(views::Border::CreateEmptyBorder(
         5, kIconWidth + kIconPaddingLeft, 5, 0));
     label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(label);
   }
@@ skipping 109 matching lines @@
   explicit NetworkDefaultView(SystemTrayItem* owner) : owner_(owner) {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
         kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingBetweenItems));
 
     icon_ = new NetworkTrayView(LARGE);
     AddChildView(icon_);
 
     label_ = new views::Label();
     AddChildView(label_);
 
-    more_ = new views::ImageView;
-    more_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-        IDR_AURA_UBER_TRAY_MORE).ToSkBitmap());
-    AddChildView(more_);
-
     Update(Shell::GetInstance()->tray_delegate()->
         GetMostRelevantNetworkIcon(true));
   }
 
   virtual ~NetworkDefaultView() {}
 
   void Update(const NetworkIconInfo& info) {
     icon_->Update(info);
     label_->SetText(info.description);
   }
 
  private:
   // Overridden from views::View.
-  virtual void Layout() OVERRIDE {
-    // Let the box-layout do the layout first. Then move the '>' arrow to right
-    // align.
-    views::View::Layout();
-
-    gfx::Rect bounds = more_->bounds();
-    bounds.set_x(width() - more_->width() - kTrayPopupPaddingBetweenItems);
-    more_->SetBoundsRect(bounds);
-  }
-
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
     owner_->PopupDetailedView(0, true);
     return true;
   }
 
   SystemTrayItem* owner_;
   NetworkTrayView* icon_;
   views::Label* label_;
-  views::ImageView* more_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
 class NetworkDetailedView : public views::View,
                             public ViewClickListener {
  public:
   explicit NetworkDetailedView(user::LoginStatus login)
       : login_(login),
         header_(NULL),
@@ skipping 201 matching lines @@
   if (tray_.get())
     tray_->Update(info);
   if (default_.get())
     default_->Update(info);
   if (detailed_.get())
     detailed_->Update();
 }
 
 }  // namespace internal
 }  // namespace ash