ash:Shelf - Update position and hit box of status area.

ash/shelf/shelf_layout_manager_unittest.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/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
@@ skipping 1818 matching lines @@
 
   GetShelfLayoutManager()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   scoped_ptr<aura::Window> w1(CreateTestWindow());
   w1->Show();
   wm::ActivateWindow(w1.get());
   EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, GetShelfWidget()->GetBackgroundType());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, GetShelfWidget()->GetBackgroundType());
 }
 
+// Verify the hit bounds of the status area extend to the edge of the shelf.
+TEST_F(ShelfLayoutManagerTest, StatusAreaHitBoxCoversEdge) {
+  UpdateDisplay("400x400");
+  ShelfLayoutManager* shelf = GetShelfLayoutManager();
+  StatusAreaWidget* status_area_widget =
+      Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  generator.MoveMouseTo(399,399);
+
+  // Test bottom right pixel for bottom alignment.
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+
+  // Test bottom right pixel for right alignment.
+  shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+
+  // Test bottom left pixel for left alignment.

[James Cook, 2013/09/18 01:36:07]

Nice, I didn't think of that case.  Good test.

+  generator.MoveMouseTo(0, 399);
+  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
+  generator.ClickLeftButton();
+  EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
+}
+
 }  // namespace internal
 }  // namespace ash