ash: A number of ui/ux changes from feedback/to better match the mocks.

ash/system/user/tray_user.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/user/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace {
 
-const int kUpdateNotificationPadding = 5;
+const int kPaddingAroundButtons = 5;
+
+const int kUserInfoHorizontalPadding = 14;
+const int kUserInfoVerticalPadding = 10;
+const int kUserInfoPaddingBetweenItems = 3;
+
+const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
 
 // A custom textbutton with some extra vertical padding, and custom border,
 // alignment and hover-effects.
 class TrayButton : public views::TextButton {
  public:
   TrayButton(views::ButtonListener* listener, const string16& text)
       : views::TextButton(listener, text),
         hover_(false),
         hover_bg_(views::Background::CreateSolidBackground(SkColorSetARGB(
-               10, 0, 0, 0))) {
+               10, 0, 0, 0))),
+        hover_border_(views::Border::CreateSolidBorder(1, kButtonStrokeColor)) {
     set_alignment(ALIGN_CENTER);
+    set_border(NULL);
   }
 
   virtual ~TrayButton() {}
 
  private:
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = views::TextButton::GetPreferredSize();
     size.Enlarge(0, 16);
     return size;
   }
 
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     hover_ = true;
     SchedulePaint();
   }
 
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
     hover_ = false;
     SchedulePaint();
   }
 
   virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
     if (hover_)
       hover_bg_->Paint(canvas, this);
     else
       views::TextButton::OnPaintBackground(canvas);
   }
 
+  virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE {
+    if (hover_)
+      hover_border_->Paint(*this, canvas);
+    else
+      views::TextButton::OnPaintBorder(canvas);
+  }
+
   bool hover_;
-  views::Background* hover_bg_;
+  scoped_ptr<views::Background> hover_bg_;
+  scoped_ptr<views::Border> hover_border_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayButton);
 };
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class UserView : public views::View,
                  public views::ButtonListener {
  public:
   explicit UserView(ash::user::LoginStatus status)
       : username_(NULL),
         email_(NULL),
         update_(NULL),
         shutdown_(NULL),
         signout_(NULL),
         lock_(NULL) {
     CHECK(status != ash::user::LOGGED_IN_NONE);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
-          0, 0, 3));
+          0, 0, 0));
 
     if (status != ash::user::LOGGED_IN_GUEST)
       AddUserInfo();
 
     views::View* button_container = new views::View;
     views::BoxLayout *layout = new
-        views::BoxLayout(views::BoxLayout::kHorizontal, 0, 5, 0);
+        views::BoxLayout(views::BoxLayout::kHorizontal,
+            kPaddingAroundButtons,
+            kPaddingAroundButtons,
+            -1);
     layout->set_spread_blank_space(true);
     button_container->SetLayoutManager(layout);
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
 
     shutdown_ = new TrayButton(this, bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_SHUT_DOWN));
-    shutdown_->set_border(NULL);
+    shutdown_->set_border(views::Border::CreateSolidSidedBorder(0, 0, 0, 1,
+        kButtonStrokeColor));
     button_container->AddChildView(shutdown_);
 
     signout_ = new TrayButton(this, bundle.GetLocalizedString(
         status == ash::user::LOGGED_IN_GUEST ? IDS_ASH_STATUS_TRAY_EXIT_GUEST :
                                                IDS_ASH_STATUS_TRAY_SIGN_OUT));
-    signout_->set_border(views::Border::CreateSolidSidedBorder(
-          0, 1, 0, 1, SkColorSetARGB(25, 0, 0, 0)));
     button_container->AddChildView(signout_);
 
     if (status != ash::user::LOGGED_IN_GUEST) {
+      signout_->set_border(views::Border::CreateSolidSidedBorder(0, 0, 0, 1,
+          kButtonStrokeColor));
       lock_ = new TrayButton(this, bundle.GetLocalizedString(
             IDS_ASH_STATUS_TRAY_LOCK));
       button_container->AddChildView(lock_);
-      lock_->set_border(NULL);
     }
 
     AddChildView(button_container);
   }
 
   virtual ~UserView() {}
 
   // Shows update notification if available.
   void RefreshForUpdate() {
     ash::SystemTrayDelegate* tray = ash::Shell::GetInstance()->tray_delegate();
     if (tray->SystemShouldUpgrade()) {
       if (update_)
         return;
       update_ = new views::View;
       update_->SetLayoutManager(new
           views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 3));
 
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       views::Label *label = new views::Label(bundle.GetLocalizedString(
           IDS_ASH_STATUS_TRAY_UPDATE));
       label->SetFont(label->font().DeriveFont(-1));
       update_->AddChildView(label);
 
       views::ImageView* icon = new views::ImageView;
       icon->SetImage(bundle.GetImageNamed(tray->GetSystemUpdateIconResource()).
           ToSkBitmap());
       update_->AddChildView(icon);
 
       update_->set_border(views::Border::CreateEmptyBorder(
-          kUpdateNotificationPadding,
-          kUpdateNotificationPadding,
-          kUpdateNotificationPadding,
-          kUpdateNotificationPadding));
+          kUserInfoVerticalPadding,
+          kUserInfoHorizontalPadding,
+          kUserInfoVerticalPadding,
+          kUserInfoHorizontalPadding));
 
       user_info_->AddChildView(update_);
     } else if (update_) {
       delete update_;
       update_ = NULL;
     }
     user_info_->InvalidateLayout();
     user_info_->SchedulePaint();
   }
 
  private:
   void AddUserInfo() {
     user_info_ = new views::View;
     user_info_->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kHorizontal, 0, 0, 3));
+        views::BoxLayout::kHorizontal, kUserInfoHorizontalPadding,
+        kUserInfoVerticalPadding, kUserInfoPaddingBetweenItems));
 
     views::View* user = new views::View;
     user->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kVertical, 14, 5, 0));
+        views::BoxLayout::kVertical, 0, 5, 0));
     ash::SystemTrayDelegate* tray =
         ash::Shell::GetInstance()->tray_delegate();
-    username_ = new views::Label(ASCIIToUTF16(tray->GetUserDisplayName()));
+    username_ = new views::Label(UTF8ToUTF16(tray->GetUserDisplayName()));
     username_->SetFont(username_->font().DeriveFont(2));
     username_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     user->AddChildView(username_);
 
-    email_ = new views::Label(ASCIIToUTF16(tray->GetUserEmail()));
+    email_ = new views::Label(UTF8ToUTF16(tray->GetUserEmail()));
     email_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     email_->SetEnabled(false);
     user->AddChildView(email_);
 
     user_info_->AddChildView(user);
     AddChildView(user_info_);
 
     RefreshForUpdate();
   }
 
@@ skipping 75 matching lines @@
 void TrayUser::DestroyDetailedView() {
 }
 
 void TrayUser::OnUpdateRecommended() {
   if (user_.get())
     user_->RefreshForUpdate();
 }
 
 }  // namespace internal
 }  // namespace ash