Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: ash/wm/immersive_fullscreen_controller_unittest.cc

Issue 2779653003: WindowTreeHostManager::GetRootWindowForDisplayId -> WmShell::GetRoo... (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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" 7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/display/mouse_cursor_event_filter.h"
11 #include "ash/public/cpp/shelf_types.h" 10 #include "ash/public/cpp/shelf_types.h"
12 #include "ash/root_window_controller.h" 11 #include "ash/root_window_controller.h"
13 #include "ash/shared/immersive_fullscreen_controller_delegate.h" 12 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
14 #include "ash/shell.h" 13 #include "ash/shell.h"
15 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
16 #include "ash/test/immersive_fullscreen_controller_test_api.h" 15 #include "ash/test/immersive_fullscreen_controller_test_api.h"
17 #include "ash/wm/window_state_aura.h" 16 #include "ash/wm/window_state_aura.h"
18 #include "ui/aura/client/aura_constants.h" 17 #include "ui/aura/client/aura_constants.h"
19 #include "ui/aura/client/cursor_client.h" 18 #include "ui/aura/client/cursor_client.h"
20 #include "ui/aura/env.h" 19 #include "ui/aura/env.h"
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 SetEnabled(true); 1079 SetEnabled(true);
1081 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); 1080 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
1082 1081
1083 // Disabling immersive fullscreen maintains the user's auto-hide selection. 1082 // Disabling immersive fullscreen maintains the user's auto-hide selection.
1084 SetEnabled(false); 1083 SetEnabled(false);
1085 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); 1084 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
1086 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); 1085 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
1087 } 1086 }
1088 1087
1089 } // namespase ash 1088 } // namespase ash
OLDNEW
« no previous file with comments | « ash/wm/drag_window_controller.cc ('k') | chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698