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/shelf_types.h" | |
8 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
10 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
11 #include "ash/display/mouse_cursor_event_filter.h" | 10 #include "ash/display/mouse_cursor_event_filter.h" |
| 11 #include "ash/public/cpp/shelf_types.h" |
12 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
13 #include "ash/shared/immersive_fullscreen_controller_delegate.h" | 13 #include "ash/shared/immersive_fullscreen_controller_delegate.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
16 #include "ash/test/display_manager_test_api.h" | 16 #include "ash/test/display_manager_test_api.h" |
17 #include "ash/test/immersive_fullscreen_controller_test_api.h" | 17 #include "ash/test/immersive_fullscreen_controller_test_api.h" |
18 #include "ash/wm/window_state_aura.h" | 18 #include "ash/wm/window_state_aura.h" |
19 #include "ui/aura/client/aura_constants.h" | 19 #include "ui/aura/client/aura_constants.h" |
20 #include "ui/aura/client/cursor_client.h" | 20 #include "ui/aura/client/cursor_client.h" |
21 #include "ui/aura/env.h" | 21 #include "ui/aura/env.h" |
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1048 SetEnabled(true); | 1048 SetEnabled(true); |
1049 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1049 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
1050 | 1050 |
1051 // Disabling immersive fullscreen maintains the user's auto-hide selection. | 1051 // Disabling immersive fullscreen maintains the user's auto-hide selection. |
1052 SetEnabled(false); | 1052 SetEnabled(false); |
1053 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 1053 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
1054 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1054 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
1055 } | 1055 } |
1056 | 1056 |
1057 } // namespase ash | 1057 } // namespase ash |
OLD | NEW |