Revert of Use shared NotificationControlButtonsView for non-arc notification buttons

ui/message_center/views/notification_view_unittest.cc

 // Copyright 2014 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 <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 11 matching lines @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/constants.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/message_view_factory.h"
 #include "ui/message_center/views/notification_button.h"
-#include "ui/message_center/views/notification_control_buttons_view.h"
-#include "ui/message_center/views/padded_button.h"
 #include "ui/message_center/views/proportional_image_view.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace message_center {
 
 // A test delegate used for tests that deal with the notification settings
@@ skipping 111 matching lines @@
 
       gfx::Point current_point = (*current)->origin();
       views::View::ConvertPointToTarget(
           (*current), notification_view(), &current_point);
 
       EXPECT_LT(last_point.y(), current_point.y());
       last = current++;
     }
   }
 
-  PaddedButton* GetCloseButton() {
-    return notification_view()
-        ->control_buttons_view_->close_button_for_testing();
-  }
-
-  PaddedButton* GetSettingsButton() {
-    return notification_view()
-        ->control_buttons_view_->settings_button_for_testing();
+  views::ImageButton* GetCloseButton() {
+    return notification_view()->close_button();
   }
 
   void UpdateNotificationViews() {
     notification_view()->UpdateWithNotification(*notification());
   }
 
   float GetNotificationSlideAmount() const {
     return notification_view_->GetSlideOutLayer()
         ->transform()
         .To2dTranslation()
@@ skipping 126 matching lines @@
   EXPECT_TRUE(NULL != notification_view()->title_view_);
   EXPECT_TRUE(NULL != notification_view()->message_view_);
   EXPECT_TRUE(NULL != notification_view()->icon_view_);
   EXPECT_TRUE(NULL != notification_view()->image_view_);
 
   notification()->set_image(gfx::Image());
   notification()->set_title(base::ASCIIToUTF16(""));
   notification()->set_message(base::ASCIIToUTF16(""));
   notification()->set_icon(gfx::Image());
 
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
   EXPECT_TRUE(NULL == notification_view()->title_view_);
   EXPECT_TRUE(NULL == notification_view()->message_view_);
   EXPECT_TRUE(NULL == notification_view()->image_view_);
-  // Notification must have a control buttons view.
-  EXPECT_TRUE(NULL != notification_view()->control_buttons_view_);
-  // Notification is not pinned and have a close button by default.
-  EXPECT_TRUE(NULL != GetCloseButton());
-  // Notification doesn't have a settings button by default.
-  EXPECT_TRUE(NULL == GetSettingsButton());
+  EXPECT_TRUE(NULL == notification_view()->settings_button_view_);
   // We still expect an icon view for all layouts.
   EXPECT_TRUE(NULL != notification_view()->icon_view_);
 }
 
 TEST_F(NotificationViewTest, CreateOrUpdateTestSettingsButton) {
   scoped_refptr<NotificationSettingsDelegate> delegate =
       new NotificationSettingsDelegate();
   Notification notf(NOTIFICATION_TYPE_BASE_FORMAT,
                     std::string("notification id"), base::UTF8ToUTF16("title"),
                     base::UTF8ToUTF16("message"), CreateTestImage(80, 80),
                     base::UTF8ToUTF16("display source"),
                     GURL("https://hello.com"),
                     NotifierId(NotifierId::APPLICATION, "extension_id"),
                     *data(), delegate.get());
 
-  notification_view()->UpdateWithNotification(notf);
+  notification_view()->CreateOrUpdateViews(notf);
   EXPECT_TRUE(NULL != notification_view()->title_view_);
   EXPECT_TRUE(NULL != notification_view()->message_view_);
   EXPECT_TRUE(NULL != notification_view()->context_message_view_);
-  EXPECT_TRUE(NULL != GetCloseButton());
-  EXPECT_TRUE(NULL != GetSettingsButton());
+  EXPECT_TRUE(NULL != notification_view()->settings_button_view_);
   EXPECT_TRUE(NULL != notification_view()->icon_view_);
 
   EXPECT_TRUE(NULL == notification_view()->image_view_);
 }
 
 TEST_F(NotificationViewTest, TestLineLimits) {
   notification()->set_image(CreateTestImage(0, 0));
   notification()->set_context_message(base::ASCIIToUTF16(""));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
 
   EXPECT_EQ(5, notification_view()->GetMessageLineLimit(0, 360));
   EXPECT_EQ(5, notification_view()->GetMessageLineLimit(1, 360));
   EXPECT_EQ(3, notification_view()->GetMessageLineLimit(2, 360));
 
   notification()->set_image(CreateTestImage(2, 2));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
 
   EXPECT_EQ(2, notification_view()->GetMessageLineLimit(0, 360));
   EXPECT_EQ(2, notification_view()->GetMessageLineLimit(1, 360));
   EXPECT_EQ(1, notification_view()->GetMessageLineLimit(2, 360));
 
   notification()->set_context_message(base::ASCIIToUTF16("foo"));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
 
   EXPECT_TRUE(notification_view()->context_message_view_ != NULL);
 
   EXPECT_EQ(1, notification_view()->GetMessageLineLimit(0, 360));
   EXPECT_EQ(1, notification_view()->GetMessageLineLimit(1, 360));
   EXPECT_EQ(0, notification_view()->GetMessageLineLimit(2, 360));
 }
 
 TEST_F(NotificationViewTest, TestIconSizing) {
   notification()->set_type(NOTIFICATION_TYPE_SIMPLE);
@@ skipping 72 matching lines @@
   paint_size = GetImagePaintSize(view);
   EXPECT_EQ(GetImageSizeForContainerSize(container_size, orig_size).ToString(),
             paint_size.ToString());
   ASSERT_GT(paint_size.height(), 0);
   EXPECT_EQ(orig_size.width() / orig_size.height(),
             paint_size.width() / paint_size.height());
 }
 
 TEST_F(NotificationViewTest, UpdateButtonsStateTest) {
   notification()->set_buttons(CreateButtons(2));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
   widget()->Show();
 
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[0]->state());
 
   // Now construct a mouse move event 1 pixel inside the boundary of the action
   // button.
   gfx::Point cursor_location(1, 1);
   views::View::ConvertPointToWidget(notification_view()->action_buttons_[0],
                                     &cursor_location);
   ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                       ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
 
   EXPECT_EQ(views::CustomButton::STATE_HOVERED,
             notification_view()->action_buttons_[0]->state());
 
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
 
   EXPECT_EQ(views::CustomButton::STATE_HOVERED,
             notification_view()->action_buttons_[0]->state());
 
   // Now construct a mouse move event 1 pixel outside the boundary of the
   // widget.
   cursor_location = gfx::Point(-1, -1);
   move = ui::MouseEvent(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
 
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[0]->state());
 }
 
 TEST_F(NotificationViewTest, UpdateButtonCountTest) {
   notification()->set_buttons(CreateButtons(2));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
   widget()->Show();
 
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[0]->state());
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[1]->state());
 
   // Now construct a mouse move event 1 pixel inside the boundary of the action
   // button.
   gfx::Point cursor_location(1, 1);
   views::View::ConvertPointToScreen(notification_view()->action_buttons_[0],
                                     &cursor_location);
   ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                       ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   ui::EventDispatchDetails details =
       views::test::WidgetTest::GetEventSink(widget())->OnEventFromSource(&move);
   EXPECT_FALSE(details.dispatcher_destroyed);
 
   EXPECT_EQ(views::CustomButton::STATE_HOVERED,
             notification_view()->action_buttons_[0]->state());
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[1]->state());
 
   notification()->set_buttons(CreateButtons(1));
-  notification_view()->UpdateWithNotification(*notification());
+  notification_view()->CreateOrUpdateViews(*notification());
 
   EXPECT_EQ(views::CustomButton::STATE_HOVERED,
             notification_view()->action_buttons_[0]->state());
   EXPECT_EQ(1u, notification_view()->action_buttons_.size());
 
   // Now construct a mouse move event 1 pixel outside the boundary of the
   // widget.
   cursor_location = gfx::Point(-1, -1);
   move = ui::MouseEvent(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
 
   EXPECT_EQ(views::CustomButton::STATE_NORMAL,
             notification_view()->action_buttons_[0]->state());
 }
 
 TEST_F(NotificationViewTest, SettingsButtonTest) {
   scoped_refptr<NotificationSettingsDelegate> delegate =
       new NotificationSettingsDelegate();
   Notification notf(NOTIFICATION_TYPE_BASE_FORMAT,
                     std::string("notification id"), base::UTF8ToUTF16("title"),
                     base::UTF8ToUTF16("message"), CreateTestImage(80, 80),
                     base::UTF8ToUTF16("display source"),
                     GURL("https://hello.com"),
                     NotifierId(NotifierId::APPLICATION, "extension_id"),
                     *data(), delegate.get());
-  notification_view()->UpdateWithNotification(notf);
+  notification_view()->CreateOrUpdateViews(notf);
   widget()->Show();
+  notification_view()->Layout();
 
-  EXPECT_TRUE(NULL != GetSettingsButton());
-  EXPECT_EQ(views::CustomButton::STATE_NORMAL, GetSettingsButton()->state());
+  EXPECT_TRUE(NULL != notification_view()->settings_button_view_);
+  EXPECT_EQ(views::CustomButton::STATE_NORMAL,
+            notification_view()->settings_button_view_->state());
 
   // Now construct a mouse move event 1 pixel inside the boundary of the action
   // button.
   gfx::Point cursor_location(1, 1);
-  views::View::ConvertPointToScreen(GetSettingsButton(), &cursor_location);
+  views::View::ConvertPointToScreen(notification_view()->settings_button_view_,
+                                    &cursor_location);
   ui::MouseEvent move(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                       ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
   ui::EventDispatchDetails details =
       views::test::WidgetTest::GetEventSink(widget())->OnEventFromSource(&move);
   EXPECT_FALSE(details.dispatcher_destroyed);
 
-  EXPECT_EQ(views::CustomButton::STATE_HOVERED, GetSettingsButton()->state());
+  EXPECT_EQ(views::CustomButton::STATE_HOVERED,
+            notification_view()->settings_button_view_->state());
 
   // Now construct a mouse move event 1 pixel outside the boundary of the
   // widget.
   cursor_location = gfx::Point(-1, -1);
   move = ui::MouseEvent(ui::ET_MOUSE_MOVED, cursor_location, cursor_location,
                         ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   widget()->OnMouseEvent(&move);
 
-  EXPECT_EQ(views::CustomButton::STATE_NORMAL, GetSettingsButton()->state());
+  EXPECT_EQ(views::CustomButton::STATE_NORMAL,
+            notification_view()->settings_button_view_->state());
 }
 
 TEST_F(NotificationViewTest, ViewOrderingTest) {
   // Tests that views are created in the correct vertical order.
   notification()->set_buttons(CreateButtons(2));
 
   // Layout the initial views.
   UpdateNotificationViews();
 
   // Double-check that vertical order is correct.
@@ skipping 146 matching lines @@
 TEST_F(NotificationViewTest, Pinned) {
   notification()->set_pinned(true);
 
   UpdateNotificationViews();
   EXPECT_EQ(NULL, GetCloseButton());
 }
 
 #endif // defined(OS_CHROMEOS)
 
 }  // namespace message_center