mash: Move StatusTray and StatusAreaWidget to //ash/common

ash/system/tray/system_tray_unittest.cc

Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
deleted file mode 100644
index d775923aca08e95696665de0b243f7cc6fd978ed..0000000000000000000000000000000000000000
--- a/ash/system/tray/system_tray_unittest.cc
+++ /dev/null
@@ -1,555 +0,0 @@
-// 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/tray/system_tray.h"
-
-#include <vector>
-
-#include "ash/common/accessibility_delegate.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/system/tray/system_tray_bubble.h"
-#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/tray_popup_item_container.h"
-#include "ash/common/system/web_notification/web_notification_tray.h"
-#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
-#include "ash/system/status_area_widget.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/wm/window_util.h"
-#include "base/run_loop.h"
-#include "base/strings/utf_string_conversions.h"
-#include "ui/aura/window.h"
-#include "ui/base/ui_base_types.h"
-#include "ui/compositor/scoped_animation_duration_scale_mode.h"
-#include "ui/events/test/event_generator.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/layout/fill_layout.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
-namespace ash {
-namespace test {
-
-namespace {
-
-// Trivial item implementation that tracks its views for testing.
-class TestItem : public SystemTrayItem {
- public:
-  TestItem()
-      : SystemTrayItem(AshTestBase::GetPrimarySystemTray()),
-        tray_view_(nullptr),
-        default_view_(nullptr),
-        detailed_view_(nullptr),
-        notification_view_(nullptr) {}
-
-  views::View* CreateTrayView(LoginStatus status) override {
-    tray_view_ = new views::View;
-    // Add a label so it has non-zero width.
-    tray_view_->SetLayoutManager(new views::FillLayout);
-    tray_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Tray")));
-    return tray_view_;
-  }
-
-  views::View* CreateDefaultView(LoginStatus status) override {
-    default_view_ = new views::View;
-    default_view_->SetLayoutManager(new views::FillLayout);
-    default_view_->AddChildView(new views::Label(base::UTF8ToUTF16("Default")));
-    return default_view_;
-  }
-
-  views::View* CreateDetailedView(LoginStatus status) override {
-    detailed_view_ = new views::View;
-    detailed_view_->SetLayoutManager(new views::FillLayout);
-    detailed_view_->AddChildView(
-        new views::Label(base::UTF8ToUTF16("Detailed")));
-    return detailed_view_;
-  }
-
-  views::View* CreateNotificationView(LoginStatus status) override {
-    notification_view_ = new views::View;
-    return notification_view_;
-  }
-
-  void DestroyTrayView() override { tray_view_ = NULL; }
-
-  void DestroyDefaultView() override { default_view_ = NULL; }
-
-  void DestroyDetailedView() override { detailed_view_ = NULL; }
-
-  void DestroyNotificationView() override { notification_view_ = NULL; }
-
-  void UpdateAfterLoginStatusChange(LoginStatus status) override {}
-
-  views::View* tray_view() const { return tray_view_; }
-  views::View* default_view() const { return default_view_; }
-  views::View* detailed_view() const { return detailed_view_; }
-  views::View* notification_view() const { return notification_view_; }
-
- private:
-  views::View* tray_view_;
-  views::View* default_view_;
-  views::View* detailed_view_;
-  views::View* notification_view_;
-};
-
-// Trivial item implementation that returns NULL from tray/default/detailed
-// view creation methods.
-class TestNoViewItem : public SystemTrayItem {
- public:
-  TestNoViewItem() : SystemTrayItem(AshTestBase::GetPrimarySystemTray()) {}
-
-  views::View* CreateTrayView(LoginStatus status) override { return nullptr; }
-
-  views::View* CreateDefaultView(LoginStatus status) override {
-    return nullptr;
-  }
-
-  views::View* CreateDetailedView(LoginStatus status) override {
-    return nullptr;
-  }
-
-  views::View* CreateNotificationView(LoginStatus status) override {
-    return nullptr;
-  }
-
-  void DestroyTrayView() override {}
-  void DestroyDefaultView() override {}
-  void DestroyDetailedView() override {}
-  void DestroyNotificationView() override {}
-  void UpdateAfterLoginStatusChange(LoginStatus status) override {}
-};
-
-class ModalWidgetDelegate : public views::WidgetDelegateView {
- public:
-  ModalWidgetDelegate() {}
-  ~ModalWidgetDelegate() override {}
-
-  views::View* GetContentsView() override { return this; }
-  ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
-};
-
-}  // namespace
-
-typedef AshTestBase SystemTrayTest;
-
-TEST_F(SystemTrayTest, SystemTrayDefaultView) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  // Ensure that closing the bubble destroys it.
-  ASSERT_TRUE(tray->CloseSystemBubble());
-  RunAllPendingInMessageLoop();
-  ASSERT_FALSE(tray->CloseSystemBubble());
-}
-
-// Opening and closing the bubble should change the coloring of the tray.
-TEST_F(SystemTrayTest, SystemTrayColoring) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-  // At the beginning the tray coloring is not active.
-  ASSERT_FALSE(tray->draw_background_as_active());
-
-  // Showing the system bubble should show the background as active.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  ASSERT_TRUE(tray->draw_background_as_active());
-
-  // Closing the system menu should change the coloring back to normal.
-  ASSERT_TRUE(tray->CloseSystemBubble());
-  RunAllPendingInMessageLoop();
-  ASSERT_FALSE(tray->draw_background_as_active());
-}
-
-// Closing the system bubble through an alignment change should change the
-// system tray coloring back to normal.
-TEST_F(SystemTrayTest, SystemTrayColoringAfterAlignmentChange) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-  WmShelf* shelf = GetPrimaryShelf();
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
-  // At the beginning the tray coloring is not active.
-  ASSERT_FALSE(tray->draw_background_as_active());
-
-  // Showing the system bubble should show the background as active.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  ASSERT_TRUE(tray->draw_background_as_active());
-
-  // Changing the alignment should close the system bubble and change the
-  // background color.
-  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  ASSERT_FALSE(tray->draw_background_as_active());
-  RunAllPendingInMessageLoop();
-  // The bubble should already be closed by now.
-  ASSERT_FALSE(tray->CloseSystemBubble());
-}
-
-TEST_F(SystemTrayTest, SystemTrayTestItems) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  TestItem* test_item = new TestItem;
-  TestItem* detailed_item = new TestItem;
-  tray->AddTrayItem(test_item);
-  tray->AddTrayItem(detailed_item);
-
-  // Check items have been added
-  const std::vector<SystemTrayItem*>& items = tray->GetTrayItems();
-  ASSERT_TRUE(std::find(items.begin(), items.end(), test_item) != items.end());
-  ASSERT_TRUE(std::find(items.begin(), items.end(), detailed_item) !=
-              items.end());
-
-  // Ensure the tray views are created.
-  ASSERT_TRUE(test_item->tray_view() != NULL);
-  ASSERT_TRUE(detailed_item->tray_view() != NULL);
-
-  // Ensure a default views are created.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  ASSERT_TRUE(test_item->default_view() != NULL);
-  ASSERT_TRUE(detailed_item->default_view() != NULL);
-
-  // Show the detailed view, ensure it's created and the default view destroyed.
-  tray->ShowDetailedView(detailed_item, 0, false, BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-  ASSERT_TRUE(test_item->default_view() == NULL);
-  ASSERT_TRUE(detailed_item->detailed_view() != NULL);
-
-  // Show the default view, ensure it's created and the detailed view destroyed.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-  ASSERT_TRUE(test_item->default_view() != NULL);
-  ASSERT_TRUE(detailed_item->detailed_view() == NULL);
-}
-
-TEST_F(SystemTrayTest, SystemTrayNoViewItems) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  // Verify that no crashes occur on items lacking some views.
-  TestNoViewItem* no_view_item = new TestNoViewItem;
-  tray->AddTrayItem(no_view_item);
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  tray->ShowDetailedView(no_view_item, 0, false, BUBBLE_USE_EXISTING);
-  RunAllPendingInMessageLoop();
-}
-
-TEST_F(SystemTrayTest, TrayWidgetAutoResizes) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  // Add an initial tray item so that the tray gets laid out correctly.
-  TestItem* initial_item = new TestItem;
-  tray->AddTrayItem(initial_item);
-
-  gfx::Size initial_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
-
-  TestItem* new_item = new TestItem;
-  tray->AddTrayItem(new_item);
-
-  gfx::Size new_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
-
-  // Adding the new item should change the size of the tray.
-  EXPECT_NE(initial_size.ToString(), new_size.ToString());
-
-  // Hiding the tray view of the new item should also change the size of the
-  // tray.
-  new_item->tray_view()->SetVisible(false);
-  EXPECT_EQ(initial_size.ToString(),
-            tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
-
-  new_item->tray_view()->SetVisible(true);
-  EXPECT_EQ(new_size.ToString(),
-            tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
-}
-
-TEST_F(SystemTrayTest, SystemTrayNotifications) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  TestItem* test_item = new TestItem;
-  TestItem* detailed_item = new TestItem;
-  tray->AddTrayItem(test_item);
-  tray->AddTrayItem(detailed_item);
-
-  // Ensure the tray views are created.
-  ASSERT_TRUE(test_item->tray_view() != NULL);
-  ASSERT_TRUE(detailed_item->tray_view() != NULL);
-
-  // Ensure a notification view is created.
-  tray->ShowNotificationView(test_item);
-  ASSERT_TRUE(test_item->notification_view() != NULL);
-
-  // Show the default view, notification view should remain.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-  ASSERT_TRUE(test_item->notification_view() != NULL);
-
-  // Show the detailed view, ensure the notification view remains.
-  tray->ShowDetailedView(detailed_item, 0, false, BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-  ASSERT_TRUE(detailed_item->detailed_view() != NULL);
-  ASSERT_TRUE(test_item->notification_view() != NULL);
-
-  // Hide the detailed view, ensure the notification view still exists.
-  ASSERT_TRUE(tray->CloseSystemBubble());
-  RunAllPendingInMessageLoop();
-  ASSERT_TRUE(detailed_item->detailed_view() == NULL);
-  ASSERT_TRUE(test_item->notification_view() != NULL);
-}
-
-TEST_F(SystemTrayTest, BubbleCreationTypesTest) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  TestItem* test_item = new TestItem;
-  tray->AddTrayItem(test_item);
-
-  // Ensure the tray views are created.
-  ASSERT_TRUE(test_item->tray_view() != NULL);
-
-  // Show the default view, ensure the notification view is destroyed.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-
-  views::Widget* widget = test_item->default_view()->GetWidget();
-  gfx::Rect bubble_bounds = widget->GetWindowBoundsInScreen();
-
-  tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
-  RunAllPendingInMessageLoop();
-
-  EXPECT_FALSE(test_item->default_view());
-
-  EXPECT_EQ(bubble_bounds.ToString(), test_item->detailed_view()
-                                          ->GetWidget()
-                                          ->GetWindowBoundsInScreen()
-                                          .ToString());
-  EXPECT_EQ(widget, test_item->detailed_view()->GetWidget());
-
-  tray->ShowDefaultView(BUBBLE_USE_EXISTING);
-  RunAllPendingInMessageLoop();
-
-  EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()
-                                          ->GetWidget()
-                                          ->GetWindowBoundsInScreen()
-                                          .ToString());
-  EXPECT_EQ(widget, test_item->default_view()->GetWidget());
-}
-
-// Tests that the tray view is laid out properly and is fully contained within
-// the shelf widget.
-TEST_F(SystemTrayTest, TrayBoundsInWidget) {
-  WmShelf* shelf = GetPrimaryShelf();
-  StatusAreaWidget* widget = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
-  SystemTray* tray = GetPrimarySystemTray();
-
-  // Test in bottom alignment.
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
-  gfx::Rect window_bounds = widget->GetWindowBoundsInScreen();
-  gfx::Rect tray_bounds = tray->GetBoundsInScreen();
-  EXPECT_TRUE(window_bounds.Contains(tray_bounds));
-
-  // Test in locked alignment.
-  shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
-  window_bounds = widget->GetWindowBoundsInScreen();
-  tray_bounds = tray->GetBoundsInScreen();
-  EXPECT_TRUE(window_bounds.Contains(tray_bounds));
-
-  // Test in the left alignment.
-  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  window_bounds = widget->GetWindowBoundsInScreen();
-  tray_bounds = tray->GetBoundsInScreen();
-  EXPECT_TRUE(window_bounds.Contains(tray_bounds));
-
-  // Test in the right alignment.
-  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
-  window_bounds = widget->GetWindowBoundsInScreen();
-  tray_bounds = tray->GetBoundsInScreen();
-  EXPECT_TRUE(window_bounds.Contains(tray_bounds));
-}
-
-TEST_F(SystemTrayTest, PersistentBubble) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->GetWidget());
-
-  TestItem* test_item = new TestItem;
-  tray->AddTrayItem(test_item);
-
-  std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
-
-  // Tests for usual default view.
-  // Activating window.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  ASSERT_TRUE(tray->HasSystemBubble());
-  wm::ActivateWindow(window.get());
-  base::RunLoop().RunUntilIdle();
-  ASSERT_FALSE(tray->HasSystemBubble());
-
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  ASSERT_TRUE(tray->HasSystemBubble());
-  {
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(5, 5));
-    generator.ClickLeftButton();
-    ASSERT_FALSE(tray->HasSystemBubble());
-  }
-
-  // Same tests for persistent default view.
-  tray->ShowPersistentDefaultView();
-  ASSERT_TRUE(tray->HasSystemBubble());
-  wm::ActivateWindow(window.get());
-  base::RunLoop().RunUntilIdle();
-  ASSERT_TRUE(tray->HasSystemBubble());
-
-  {
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(5, 5));
-    generator.ClickLeftButton();
-    ASSERT_TRUE(tray->HasSystemBubble());
-  }
-}
-
-#if defined(OS_CHROMEOS)
-// Accessibility/Settings tray items are available only on cros.
-#define MAYBE_WithSystemModal WithSystemModal
-#else
-#define MAYBE_WithSystemModal DISABLED_WithSystemModal
-#endif
-TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
-  // Check if the accessibility item is created even with system modal dialog.
-  WmShell::Get()->GetAccessibilityDelegate()->SetVirtualKeyboardEnabled(true);
-  views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
-      new ModalWidgetDelegate(), Shell::GetPrimaryRootWindow(),
-      gfx::Rect(0, 0, 100, 100));
-  widget->Show();
-
-  SystemTray* tray = GetPrimarySystemTray();
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  ASSERT_TRUE(tray->HasSystemBubble());
-  const views::View* accessibility =
-      tray->GetSystemBubble()->bubble_view()->GetViewByID(
-          test::kAccessibilityTrayItemViewId);
-  ASSERT_TRUE(accessibility);
-  EXPECT_TRUE(accessibility->visible());
-  EXPECT_FALSE(tray->GetSystemBubble()->bubble_view()->GetViewByID(
-      test::kSettingsTrayItemViewId));
-
-  widget->Close();
-
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  // System modal is gone. The bubble should now contains settings
-  // as well.
-  accessibility = tray->GetSystemBubble()->bubble_view()->GetViewByID(
-      test::kAccessibilityTrayItemViewId);
-  ASSERT_TRUE(accessibility);
-  EXPECT_TRUE(accessibility->visible());
-
-  const views::View* settings =
-      tray->GetSystemBubble()->bubble_view()->GetViewByID(
-          test::kSettingsTrayItemViewId);
-  ASSERT_TRUE(settings);
-  EXPECT_TRUE(settings->visible());
-}
-
-// Tests that if SetVisible(true) is called while animating to hidden that the
-// tray becomes visible, and stops animating to hidden.
-TEST_F(SystemTrayTest, SetVisibleDuringHideAnimation) {
-  SystemTray* tray = GetPrimarySystemTray();
-  ASSERT_TRUE(tray->visible());
-
-  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> animation_duration;
-  animation_duration.reset(new ui::ScopedAnimationDurationScaleMode(
-      ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
-  tray->SetVisible(false);
-  EXPECT_TRUE(tray->visible());
-  EXPECT_EQ(0.0f, tray->layer()->GetTargetOpacity());
-
-  tray->SetVisible(true);
-  animation_duration.reset();
-  tray->layer()->GetAnimator()->StopAnimating();
-  EXPECT_TRUE(tray->visible());
-  EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
-}
-
-#if defined(OS_CHROMEOS)
-// Tests that touch on an item in the system bubble triggers it to become
-// active.
-TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedback) {
-  SystemTray* tray = GetPrimarySystemTray();
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  TrayPopupItemContainer* view = static_cast<TrayPopupItemContainer*>(
-      tray->GetSystemBubble()->bubble_view()->child_at(0));
-  EXPECT_FALSE(view->active());
-
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->active());
-
-  generator.ReleaseTouch();
-  EXPECT_FALSE(view->active());
-}
-
-// Tests that touch events on an item in the system bubble cause it to stop
-// being active.
-TEST_F(SystemTrayTest, TrayPopupItemContainerTouchFeedbackCancellation) {
-  SystemTray* tray = GetPrimarySystemTray();
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-
-  TrayPopupItemContainer* view = static_cast<TrayPopupItemContainer*>(
-      tray->GetSystemBubble()->bubble_view()->child_at(0));
-  EXPECT_FALSE(view->active());
-
-  gfx::Rect view_bounds = view->GetBoundsInScreen();
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  generator.set_current_location(view_bounds.CenterPoint());
-  generator.PressTouch();
-  EXPECT_TRUE(view->active());
-
-  gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
-  generator.MoveTouch(move_point);
-  EXPECT_FALSE(view->active());
-
-  generator.set_current_location(move_point);
-  generator.ReleaseTouch();
-  EXPECT_FALSE(view->active());
-}
-
-TEST_F(SystemTrayTest, SystemTrayHeightWithBubble) {
-  SystemTray* tray = GetPrimarySystemTray();
-  WebNotificationTray* notification_tray =
-      StatusAreaWidgetTestHelper::GetStatusAreaWidget()
-          ->web_notification_tray();
-
-  // Ensure the initial tray bubble height is zero.
-  EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
-
-  // Show the default view, ensure the tray bubble height is changed.
-  tray->ShowDefaultView(BUBBLE_CREATE_NEW);
-  RunAllPendingInMessageLoop();
-  EXPECT_LT(0, notification_tray->tray_bubble_height_for_test());
-
-  // Hide the default view, ensure the tray bubble height is back to zero.
-  ASSERT_TRUE(tray->CloseSystemBubble());
-  RunAllPendingInMessageLoop();
-
-  EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
-}
-#endif  // OS_CHROMEOS
-
-}  // namespace test
-}  // namespace ash