Show overview mode button in TouchView with open modal window

ash/system/overview/overview_button_tray_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 "ash/system/overview/overview_button_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/user/login_status.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
+#include "ui/aura/client/aura_constants.h"

[jonross, 2015/05/01 17:30:15]

Necessary?

[tdanderson, 2015/05/01 18:07:31]

This was part of a quick hack and I meant to remove it. It's gone now.

 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 108 matching lines @@
   Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_NONE);
   EXPECT_FALSE(GetTray()->visible());
   SetUserLoggedIn(true);
   SetSessionStarted(true);
   Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER);
   EXPECT_TRUE(GetTray()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
+// Tests that the overview button becomes visible when the user enters
+// maximize mode with a system modal window open.
+TEST_F(OverviewButtonTrayTest, VisibilityChangesForSystemModalWindow) {
+  scoped_ptr<aura::Window> window(
+      CreateTestModalWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
+  ASSERT_TRUE(Shell::GetInstance()->IsSystemModalWindowOpen());
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(true);
+  EXPECT_TRUE(GetTray()->visible());
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(false);

[jonross, 2015/05/01 17:30:15]

Check afterwards to make sure visibility toggling works in both directions?

[tdanderson, 2015/05/01 18:07:31]

Done.

+}
+
 // Tests that the tray only renders as active while selection is ongoing. Any
 // dismissal of overview mode clears the active state.
 TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
   ASSERT_FALSE(
       Shell::GetInstance()->window_selector_controller()->IsSelecting());
   ASSERT_FALSE(GetTray()->draw_background_as_active());
 
   // Overview Mode only works when there is a window
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
@@ skipping 29 matching lines @@
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())
       .Rotate(gfx::Display::ROTATE_270, gfx::Display::ROTATION_SOURCE_ACTIVE);
 
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash