Revert 188637 "Added text line limits to collapsed and expanded ..."

ui/message_center/views/notification_view.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 "ui/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_change_observer.h"
 #include "ui/message_center/notification_types.h"
-#include "ui/message_center/views/bounded_label.h"
 #include "ui/message_center/views/message_simple_view.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/image_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/layout/fill_layout.h"
 
 namespace {
 
@@ skipping 302 matching lines @@
   }
 
   // Currently all roads lead to the generic NotificationView.
   return new NotificationView(notification, observer, expanded);
 }
 
 NotificationView::NotificationView(const Notification& notification,
                                    NotificationChangeObserver* observer,
                                    bool expanded)
     : MessageView(notification, observer, expanded) {
-  // As we build the view, we'll see if any part of it is expandable.
-  bool expandable = false;
-
   // Create the opaque background that's above the view's shadow.
   background_view_ = new views::View();
   background_view_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
 
   // Create the top_view_, which collects into a vertical box all content
   // at the top of the notification (to the right of the icon) except for the
   // close button.
   top_view_ = new ContainerView();
 
   // Create the title view if appropriate.
   title_view_ = NULL;
   if (!notification.title().empty()) {
-    gfx::Font font = views::Label().font().DeriveFont(4);
-    title_view_ = new BoundedLabel(notification.title(), font, 1);
+    title_view_ = new views::Label(notification.title());
     title_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    if (is_expanded())
+      title_view_->SetMultiLine(true);
+    else
+      title_view_->SetElideBehavior(views::Label::ELIDE_AT_END);
+    title_view_->SetFont(title_view_->font().DeriveFont(4));
     title_view_->SetEnabledColor(kTitleColor);
     title_view_->SetBackgroundColor(kTitleBackgroundColor);
     title_view_->set_border(MakeBorder(kTextTopPadding, 3));
     top_view_->AddChildView(title_view_);
   }
 
   // Create the message view if appropriate.
   message_view_ = NULL;
   if (!notification.message().empty()) {
-    size_t lines = (is_expanded() && notification.image().IsEmpty()) ? 7 : 2;
-    message_view_ = new BoundedLabel(notification.message(), lines);
+    message_view_ = new views::Label(notification.message());
     message_view_->SetVisible(!is_expanded() || !notification.items().size());
     message_view_->set_collapse_when_hidden(true);
     message_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    if (is_expanded())
+      message_view_->SetMultiLine(true);
+    else
+      message_view_->SetElideBehavior(views::Label::ELIDE_AT_END);
     message_view_->SetEnabledColor(kMessageColor);
     message_view_->SetBackgroundColor(kMessageBackgroundColor);
     message_view_->set_border(MakeBorder(0, 3));
     top_view_->AddChildView(message_view_);
-    expandable = (message_view_->GetPreferredLines() > lines);
   }
 
   // Create the list item views (up to a maximum).
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
     item_view->SetVisible(is_expanded());
     item_view->set_border(MakeBorder(0, 4));
     item_views_.push_back(item_view);
     top_view_->AddChildView(item_view);
-    expandable = true;
   }
 
   // Create the notification icon view.
   icon_view_ = new ProportionalImageView(notification.icon().AsImageSkia());
 
   // Create the bottom_view_, which collects into a vertical box all content
   // below the notification icon except for the expand button.
   bottom_view_ = new ContainerView();
   bottom_view_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
 
   // Create the image view if appropriate.
   image_view_ = NULL;
   if (!notification.image().IsEmpty()) {
     image_view_ = new ProportionalImageView(notification.image().AsImageSkia());
     image_view_->SetVisible(is_expanded());
     bottom_view_->AddChildView(image_view_);
-    expandable = true;
   }
 
   // Create action buttons if appropriate.
   std::vector<ButtonInfo> buttons = notification.buttons();
   for (size_t i = 0; i < buttons.size(); ++i) {
     views::View* separator = new views::ImageView();
     separator->set_border(MakeBorder(1, 0, 0, 0, kButtonSeparatorColor));
     bottom_view_->AddChildView(separator);
     NotificationButton* button = new NotificationButton(this);
     ButtonInfo button_info = buttons[i];
     button->SetTitle(button_info.title);
     button->SetIcon(button_info.icon.AsImageSkia());
     action_buttons_.push_back(button);
     bottom_view_->AddChildView(button);
   }
 
   // Hide the expand button if appropriate.
+  bool expandable = item_views_.size() || image_view_;
   expand_button()->SetVisible(expandable && !is_expanded());
 
   // Put together the different content and control views. Layering those allows
   // for proper layout logic and it also allows the close and expand buttons to
   // overlap the content as needed to provide large enough click and touch areas
   // (<http://crbug.com/168822> and <http://crbug.com/168856>).
   AddChildView(background_view_);
   AddChildView(top_view_);
   AddChildView(icon_view_);
   AddChildView(bottom_view_);
@@ skipping 56 matching lines @@
       observer()->OnButtonClicked(notification_id(), i);
       return;
     }
   }
 
   // Let the superclass handled anything other than action buttons.
   MessageView::ButtonPressed(sender, event);
 
   // Show and hide subviews appropriately on expansion.
   if (sender == expand_button()) {
-    if (message_view_ && !item_views_.size() && !image_view_)
-      message_view_->SetMaxLines(7);
-    else if (message_view_ && item_views_.size())
-      message_view_->SetVisible(false);
+    if (message_view_)
+      message_view_->SetVisible(!item_views_.size());
     for (size_t i = 0; i < item_views_.size(); ++i)
       item_views_[i]->SetVisible(true);
     if (image_view_)
       image_view_->SetVisible(true);
     expand_button()->SetVisible(false);
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
 }  // namespace message_center