| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shared/immersive_fullscreen_controller.h" | 5 #include "ash/shared/immersive_fullscreen_controller.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/wm_shelf.h" | |
| 8 #include "ash/common/wm/window_state.h" | |
| 9 #include "ash/common/wm_shell.h" | |
| 10 #include "ash/display/mouse_cursor_event_filter.h" | 7 #include "ash/display/mouse_cursor_event_filter.h" |
| 11 #include "ash/public/cpp/shelf_types.h" | 8 #include "ash/public/cpp/shelf_types.h" |
| 12 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 13 #include "ash/shared/immersive_fullscreen_controller_delegate.h" | 10 #include "ash/shared/immersive_fullscreen_controller_delegate.h" |
| 11 #include "ash/shelf/wm_shelf.h" |
| 14 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 15 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 16 #include "ash/test/immersive_fullscreen_controller_test_api.h" | 14 #include "ash/test/immersive_fullscreen_controller_test_api.h" |
| 15 #include "ash/wm/window_state.h" |
| 17 #include "ash/wm/window_state_aura.h" | 16 #include "ash/wm/window_state_aura.h" |
| 17 #include "ash/wm_shell.h" |
| 18 #include "ui/aura/client/aura_constants.h" | 18 #include "ui/aura/client/aura_constants.h" |
| 19 #include "ui/aura/client/cursor_client.h" | 19 #include "ui/aura/client/cursor_client.h" |
| 20 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
| 21 #include "ui/aura/test/test_window_delegate.h" | 21 #include "ui/aura/test/test_window_delegate.h" |
| 22 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
| 23 #include "ui/aura/window_event_dispatcher.h" | 23 #include "ui/aura/window_event_dispatcher.h" |
| 24 #include "ui/display/display_layout.h" | 24 #include "ui/display/display_layout.h" |
| 25 #include "ui/display/manager/display_manager.h" | 25 #include "ui/display/manager/display_manager.h" |
| 26 #include "ui/display/test/display_manager_test_api.h" | 26 #include "ui/display/test/display_manager_test_api.h" |
| 27 #include "ui/events/event_utils.h" | 27 #include "ui/events/event_utils.h" |
| (...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 SetEnabled(true); | 1078 SetEnabled(true); |
| 1079 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1079 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
| 1080 | 1080 |
| 1081 // Disabling immersive fullscreen maintains the user's auto-hide selection. | 1081 // Disabling immersive fullscreen maintains the user's auto-hide selection. |
| 1082 SetEnabled(false); | 1082 SetEnabled(false); |
| 1083 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 1083 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 1084 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1084 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
| 1085 } | 1085 } |
| 1086 | 1086 |
| 1087 } // namespase ash | 1087 } // namespase ash |
| OLD | NEW |