Puts notification buttons back below the image

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 "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 48 matching lines @@
     bitmap.eraseRGB(0, 255, 0);
     return bitmap;
   }
 
   std::vector<ButtonInfo> CreateButtons(int number) {
     ButtonInfo info(base::ASCIIToUTF16("Test button title."));
     info.icon = CreateTestImage(4, 4);
     return std::vector<ButtonInfo>(number, info);
   }
 
+  void CheckVerticalOrderInNotification() {
+    std::vector<views::View*> vertical_order;
+    vertical_order.push_back(notification_view()->top_view_);
+    vertical_order.push_back(notification_view()->image_view_);
+    std::copy(notification_view()->action_buttons_.begin(),
+              notification_view()->action_buttons_.end(),
+              std::back_inserter(vertical_order));
+    std::vector<views::View*>::iterator current = vertical_order.begin();
+    std::vector<views::View*>::iterator last = current++;
+    while (current != vertical_order.end()) {
+      gfx::Point last_point = (*last)->bounds().origin();
+      views::View::ConvertPointToTarget(
+          (*last), notification_view(), &last_point);
+
+      gfx::Point current_point = (*current)->bounds().origin();

[robliao, 2014/05/30 01:19:33]

This was CenterPoint before. Is origin a better measure? I would expect the
result to be the same either way.

[dewittj, 2014/06/02 18:00:05]

It was easier for me to verify that they were in roughly the right spot while
logging, and seemed equivalent so I left it as origin()

+      views::View::ConvertPointToTarget(
+          (*current), notification_view(), &current_point);
+
+      EXPECT_LT(last_point.y(), current_point.y());
+      last = current++;
+    }
+  }
+
+  void UpdateNotificationViews() {
+    notification_view()->CreateOrUpdateViews(*notification());
+    notification_view()->Layout();
+  }
+
  private:
   scoped_ptr<RichNotificationData> data_;
   scoped_ptr<Notification> notification_;
   scoped_ptr<NotificationView> notification_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationViewTest);
 };
 
 NotificationViewTest::NotificationViewTest() {
 }
@@ skipping 191 matching lines @@
   move = ui::MouseEvent(ui::ET_MOUSE_MOVED,
                         cursor_location,
                         cursor_location,
                         ui::EF_NONE,
                         ui::EF_NONE);
   widget()->OnMouseEvent(&move);
 
   EXPECT_TRUE(NULL == notification_view()->action_buttons_[0]->background());
 }
 
+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.
+  CheckVerticalOrderInNotification();
+
+  // Tests that views remain in that order even after an update.
+  UpdateNotificationViews();
+  CheckVerticalOrderInNotification();
+}
+
 }  // namespace message_center