Adding new general bubble error message consisting of icon, message and caption. Using this message…

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 <algorithm>
 #include <climits>
 #include <vector>
 
+#include "ash/popup_message.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_popup_label_button.h"
 #include "ash/system/tray/tray_popup_label_button_border.h"
@@ skipping 77 matching lines @@
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_HOVER_BACKGROUND,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
 };
 
+// Offsetting the popup message relativ to the tray menu.

[Nikita (slow), 2013/05/21 18:03:52]

nit: relative

[Mr4D (OOO till 08-26), 2013/05/21 19:23:33]

Done.

+const int kPopupMessageOffset = 25;
+
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 // A custom image view with rounded edges.
 class RoundedImageView : public views::View {
  public:
@@ skipping 137 matching lines @@
   // Create the additional user card content for the public mode.
   void AddLoggedInPublicModeUserCardContent(SystemTrayItem* owner);
 
   // Create the menu option to add another user. If |disabled| is set the user
   // cannot actively click on the item.
   void ToggleAddUserMenuOption();
 
   MultiProfileIndex multiprofile_index_;
   views::View* user_card_;
   views::View* logout_button_;
+  scoped_ptr<ash::PopupMessage> popup_message_;
   scoped_ptr<views::Widget> add_menu_option_;
 
   // The mouse watcher which takes care of out of window hover events.
   scoped_ptr<views::MouseWatcher> mouse_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(UserView);
 };
 
 // The menu item view which gets shown when the user clicks in multi profile
 // mode onto the user item.
 class AddUserView : public views::CustomButton,
                     public views::ButtonListener {
  public:
   // The |owner| is the view for which this view gets created. The |listener|
   // will get notified when this item gets clicked.
   AddUserView(UserCard* owner, views::ButtonListener* listener);
   virtual ~AddUserView();
 
+  // Get the anchor view for a message.
+  views::View* anchor() { return anchor_; }
+
   // Overridden from views::ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
  private:
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual int GetHeightForWidth(int width) OVERRIDE;
   virtual void Layout() OVERRIDE;
 
   // Create the additional client content for this item.
   void AddContent();
 
   // This is the content we create and show.
   views::View* add_user_;
 
   // This listener will get informed when someone clicks on this button.
   views::ButtonListener* listener_;
 
   // This is the owner view of this item.
   UserCard* owner_;
 
+  // The anchor view for the "all users are already assigned" message.

[Nikita (slow), 2013/05/21 18:03:52]

nit: I would leave comment more generic as it could be other message as well.

[Mr4D (OOO till 08-26), 2013/05/21 19:23:33]

Good point. Done.

+  views::View* anchor_;
+
   DISALLOW_COPY_AND_ASSIGN(AddUserView);
 };
 
 RoundedImageView::RoundedImageView(int corner_radius, bool active_user)
     : corner_radius_(corner_radius),
       active_user_(active_user) {}
 
 RoundedImageView::~RoundedImageView() {}
 
 void RoundedImageView::SetImage(const gfx::ImageSkia& img,
@@ skipping 269 matching lines @@
   // The logout button must be added before the user card so that the user card
   // can correctly calculate the remaining available width.
   // Note that only the current multiprofile user gets a button.
   AddLogoutButton(!multiprofile_index_ ? login : ash::user::LOGGED_IN_LOCKED);
   AddUserCard(owner, login);
 }
 
 UserView::~UserView() {}
 
 void UserView::MouseMovedOutOfHost() {
-  // Make sure that the MouseWatcher does not outlive our add menu option.
-  DCHECK(!add_menu_option_.get());
+  popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 gfx::Size UserView::GetPreferredSize() {
   gfx::Size size = views::View::GetPreferredSize();
   // Only the active user panel will be forced to a certain height.
   if (!multiprofile_index_) {
     size.set_height(std::max(size.height(),
                              kTrayPopupItemHeight + GetInsets().height()));
@@ skipping 219 matching lines @@
 }
 
 void UserView::AddLoggedInPublicModeUserCardContent(SystemTrayItem* owner) {
   user_card_->AddChildView(CreateIconForUserCard(ash::user::LOGGED_IN_PUBLIC));
   user_card_->AddChildView(new PublicAccountUserDetails(
       owner, GetPreferredSize().width() + kTrayPopupPaddingBetweenItems));
 }
 
 void UserView::ToggleAddUserMenuOption() {
   if (add_menu_option_.get()) {
+    popup_message_.reset();
     mouse_watcher_.reset();
     add_menu_option_.reset();
     return;
   }
 
   // Note: We do not need to install a global event handler to delete this
   // item since it will destroyed automatically before the menu / user menu item
   // gets destroyed..
   const SessionStateDelegate* session_state_delegate =
       ash::Shell::GetInstance()->session_state_delegate();
@@ skipping 13 matching lines @@
   add_menu_option_->GetNativeWindow()->set_owned_by_parent(false);
   SetShadowType(add_menu_option_->GetNativeView(),
                 views::corewm::SHADOW_TYPE_NONE);
 
   // Position it below our user card.
   gfx::Rect bounds = user_card_->GetBoundsInScreen();
   bounds.set_y(bounds.y() + bounds.height());
   add_menu_option_->SetBounds(bounds);
 
   // Show the content.
-  add_menu_option_->SetContentsView(new AddUserView(
-      static_cast<UserCard*>(user_card_), this));
+  AddUserView* add_user_view = new AddUserView(
+      static_cast<UserCard*>(user_card_), this);
+  add_menu_option_->SetContentsView(add_user_view);
   add_menu_option_->SetAlwaysOnTop(true);
   add_menu_option_->Show();
   if (cannot_add_more_users) {
-    // TODO(skuhne): Use IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER and
-    // IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER when showing the error
-    // message that no more users can be added.
+    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+    popup_message_.reset(new PopupMessage(
+        bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER),
+        bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER),
+        PopupMessage::ICON_WARNING,
+        add_user_view->anchor(),
+        views::BubbleBorder::TOP_LEFT,
+        gfx::Size(parent()->bounds().width() - kPopupMessageOffset, 0),
+        2 * kPopupMessageOffset));
   }
   // Find the screen area which encloses both elements and sets then a mouse
   // watcher which will close the "menu".
   gfx::Rect area = user_card_->GetBoundsInScreen();
   area.set_height(2 * area.height());
   mouse_watcher_.reset(new views::MouseWatcher(
       new UserViewMouseWatcherHost(area),
       this));
   mouse_watcher_->Start();
 }
 
 AddUserView::AddUserView(UserCard* owner, views::ButtonListener* listener)
     : CustomButton(listener_),
       add_user_(NULL),
       listener_(listener),
-      owner_(owner) {
+      owner_(owner),
+      anchor_(NULL) {
   AddContent();
   owner_->ForceBorderVisible(true);
 }
 
 AddUserView::~AddUserView() {
   owner_->ForceBorderVisible(false);
 }
 
 gfx::Size AddUserView::GetPreferredSize() {
   return owner_->bounds().size();
@@ skipping 33 matching lines @@
   add_user_->set_border(views::Border::CreateEmptyBorder(
       kUserCardVerticalPadding,
       kTrayPopupPaddingHorizontal- kTrayUserTileHoverBorderInset,
       kUserCardVerticalPadding,
       kTrayPopupPaddingHorizontal- kTrayUserTileHoverBorderInset));
 
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0 , kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
-  // Add the [+] icon.
+  // Add the [+] icon which is also the anchor for messages.
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   RoundedImageView* icon = new RoundedImageView(kProfileRoundedCornerRadius,
                                                 true);
-  // TODO(skuhne): Add the resource and load the proper icon.
+  anchor_ = icon;
   icon->SetImage(*ui::ResourceBundle::GetSharedInstance().
-      GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON).ToImageSkia(),
+      GetImageNamed(IDR_AURA_UBER_TRAY_ADD_MULTIPROFILE_USER).ToImageSkia(),
       gfx::Size(kUserIconSize, kUserIconSize));
   add_user_->AddChildView(icon);
 
   // Add the command text.
   views::Label* command_label = new views::Label(
       bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
   command_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   add_user_->AddChildView(command_label);
 }
 
@@ skipping 41 matching lines @@
   // If there are multiple users logged in, the users will be separated from the
   // rest of the menu by a separator.
   if (multiprofile_index_ ==
           session_state_delegate->GetMaximumNumberOfLoggedInUsers() &&
       logged_in_users > 1) {
     return new views::View();
   }
 
   // Do not show more UserView's then there are logged in users.
   if (multiprofile_index_ >= logged_in_users)
-    return NULL;;
+    return NULL;
 
   user_ = new tray::UserView(this, status, multiprofile_index_);
   return user_;
 }
 
 views::View* TrayUser::CreateDetailedView(user::LoginStatus status) {
   return NULL;
 }
 
 void TrayUser::DestroyTrayView() {
@@ skipping 114 matching lines @@
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
             multiprofile_index_),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash