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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/fullscreen_window_finder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/public/cpp/shell_window_ids.h" 5 #include "ash/public/cpp/shell_window_ids.h"
6 #include "ash/session/session_controller.h" 6 #include "ash/session/session_controller.h"
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/test/ash_test_helper.h" 9 #include "ash/test/ash_test_helper.h"
10 #include "ash/test/test_session_controller_client.h" 10 #include "ash/test/test_session_controller_client.h"
11 #include "ash/wm/lock_state_controller.h" 11 #include "ash/wm/lock_state_controller.h"
12 #include "ash/wm/window_state.h" 12 #include "ash/wm/window_state.h"
13 #include "ash/wm/window_state_aura.h"
14 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
15 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
16 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 15 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
17 #include "ui/aura/client/aura_constants.h" 16 #include "ui/aura/client/aura_constants.h"
18 #include "ui/aura/client/window_parenting_client.h" 17 #include "ui/aura/client/window_parenting_client.h"
19 #include "ui/views/test/widget_test.h" 18 #include "ui/views/test/widget_test.h"
20 #include "ui/views/view.h" 19 #include "ui/views/view.h"
21 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
22 21
23 namespace ash { 22 namespace ash {
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 EXPECT_FALSE(delegate.view()->HasFocus()); 193 EXPECT_FALSE(delegate.view()->HasFocus());
195 194
196 UnblockUserSession(); 195 UnblockUserSession();
197 EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked()); 196 EXPECT_FALSE(Shell::Get()->session_controller()->IsScreenLocked());
198 EXPECT_TRUE(delegate.GetWidget()->IsActive()); 197 EXPECT_TRUE(delegate.GetWidget()->IsActive());
199 EXPECT_TRUE(delegate.view()->HasFocus()); 198 EXPECT_TRUE(delegate.view()->HasFocus());
200 } 199 }
201 200
202 } // namespace test 201 } // namespace test
203 } // namespace ash 202 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/fullscreen_window_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698