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

Side by Side Diff: ash/mus/test/wm_test_base.h

Issue 2625733003: Re-reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: rebase, fix conflict with sky Created 3 years, 11 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/common/wm_shell.cc ('k') | ash/mus/test/wm_test_base.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef ASH_MUS_TEST_WM_TEST_BASE_H_ 5 #ifndef ASH_MUS_TEST_WM_TEST_BASE_H_
6 #define ASH_MUS_TEST_WM_TEST_BASE_H_ 6 #define ASH_MUS_TEST_WM_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const gfx::Rect& bounds); 75 const gfx::Rect& bounds);
76 76
77 protected: 77 protected:
78 // testing::Test: 78 // testing::Test:
79 void SetUp() override; 79 void SetUp() override;
80 void TearDown() override; 80 void TearDown() override;
81 81
82 private: 82 private:
83 friend class AshTestImplMus; 83 friend class AshTestImplMus;
84 84
85 // Simulates the first user logging in and the session becoming active.
86 // Classic ash handles this via AshTestHelper and TestSessionStateDelegate.
87 void SimulateUserLogin();
88
85 bool setup_called_ = false; 89 bool setup_called_ = false;
86 bool teardown_called_ = false; 90 bool teardown_called_ = false;
87 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 91 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
88 std::unique_ptr<WmWindowAuraTestApi::GlobalMinimumSizeLock> 92 std::unique_ptr<WmWindowAuraTestApi::GlobalMinimumSizeLock>
89 minimum_size_lock_; 93 minimum_size_lock_;
90 std::unique_ptr<WmTestHelper> test_helper_; 94 std::unique_ptr<WmTestHelper> test_helper_;
91 95
92 DISALLOW_COPY_AND_ASSIGN(WmTestBase); 96 DISALLOW_COPY_AND_ASSIGN(WmTestBase);
93 }; 97 };
94 98
95 } // namespace mus 99 } // namespace mus
96 } // namespace ash 100 } // namespace ash
97 101
98 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_ 102 #endif // ASH_MUS_TEST_WM_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698