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

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

Issue 2619943002: Revert "chromeos: Fix shelf appearing at login screen under mash" (Closed)
Patch Set: 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/ash_test_impl_mus.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_ASH_TEST_IMPL_MUS_H_ 5 #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ 6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
7 7
8 #include "ash/common/test/ash_test_impl.h" 8 #include "ash/common/test/ash_test_impl.h"
9 #include "ash/mus/test/wm_test_base.h" 9 #include "ash/mus/test/wm_test_base.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 24 matching lines...) Expand all
35 display::Display GetSecondaryDisplay() override; 35 display::Display GetSecondaryDisplay() override;
36 bool SetSecondaryDisplayPlacement( 36 bool SetSecondaryDisplayPlacement(
37 display::DisplayPlacement::Position position, 37 display::DisplayPlacement::Position position,
38 int offset) override; 38 int offset) override;
39 void ConfigureWidgetInitParamsForDisplay( 39 void ConfigureWidgetInitParamsForDisplay(
40 WmWindow* window, 40 WmWindow* window,
41 views::Widget::InitParams* init_params) override; 41 views::Widget::InitParams* init_params) override;
42 void AddTransientChild(WmWindow* parent, WmWindow* window) override; 42 void AddTransientChild(WmWindow* parent, WmWindow* window) override;
43 43
44 private: 44 private:
45 // Simulates the first user logging in and the session becoming active.
46 // Classic ash handles this via AshTestHelper and TestSessionStateDelegate.
47 void SimulateUserLogin();
48
49 // TODO(sky): fold WmTestBase directly into this class when no more subclasses 45 // TODO(sky): fold WmTestBase directly into this class when no more subclasses
50 // of WmTestBase. 46 // of WmTestBase.
51 std::unique_ptr<WmTestBase> wm_test_base_; 47 std::unique_ptr<WmTestBase> wm_test_base_;
52 48
53 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus); 49 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus);
54 }; 50 };
55 51
56 } // namespace mus 52 } // namespace mus
57 } // namespace ash 53 } // namespace ash
58 54
59 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ 55 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698