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/wm/immersive_fullscreen_controller.h" | 5 #include "ash/wm/immersive_fullscreen_controller.h" |
6 | 6 |
7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/screen_ash.h" | |
10 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shelf/shelf_types.h" | 10 #include "ash/shelf/shelf_types.h" |
12 #include "ash/shell.h" | 11 #include "ash/shell.h" |
13 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
14 #include "ui/aura/client/aura_constants.h" | 13 #include "ui/aura/client/aura_constants.h" |
15 #include "ui/aura/client/cursor_client.h" | 14 #include "ui/aura/client/cursor_client.h" |
16 #include "ui/aura/env.h" | 15 #include "ui/aura/env.h" |
17 #include "ui/aura/root_window.h" | 16 #include "ui/aura/root_window.h" |
18 #include "ui/aura/test/event_generator.h" | 17 #include "ui/aura/test/event_generator.h" |
19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
949 // Disabling immersive fullscreen maintains the user's auto-hide selection. | 948 // Disabling immersive fullscreen maintains the user's auto-hide selection. |
950 SetEnabled(false); | 949 SetEnabled(false); |
951 window()->SetProperty(aura::client::kShowStateKey, | 950 window()->SetProperty(aura::client::kShowStateKey, |
952 ui::SHOW_STATE_NORMAL); | 951 ui::SHOW_STATE_NORMAL); |
953 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); | 952 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); |
954 } | 953 } |
955 | 954 |
956 } // namespase ash | 955 } // namespase ash |
957 | 956 |
958 #endif // defined(OS_CHROMEOS) | 957 #endif // defined(OS_CHROMEOS) |
OLD | NEW |