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

Side by Side Diff: ui/aura/test/aura_mus_test_base.cc

Issue 2445163002: Make aura work with mus (Closed)
Patch Set: NON_EXPORTED_BASE_CLASS Created 4 years, 1 month 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 | « ui/aura/test/aura_mus_test_base.h ('k') | ui/aura/test/aura_test_base.h » ('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 #include "base/test/scoped_command_line.h" 5 #include "ui/aura/test/aura_mus_test_base.h"
6 6
7 namespace base { 7 namespace aura {
8 namespace test { 8 namespace test {
9 9
10 ScopedCommandLine::ScopedCommandLine() 10 AuraMusWmTestBase::AuraMusWmTestBase() {}
11 : original_command_line_(*base::CommandLine::ForCurrentProcess()) {}
12 11
13 ScopedCommandLine::~ScopedCommandLine() { 12 AuraMusWmTestBase::~AuraMusWmTestBase() {}
14 *base::CommandLine::ForCurrentProcess() = original_command_line_; 13
14 void AuraMusWmTestBase::SetUp() {
15 EnableMus();
16 AuraTestBase::SetUp();
15 } 17 }
16 18
17 CommandLine* ScopedCommandLine::GetProcessCommandLine() { 19 AuraMusClientTestBase::AuraMusClientTestBase() {}
18 return base::CommandLine::ForCurrentProcess(); 20
21 AuraMusClientTestBase::~AuraMusClientTestBase() {}
22
23 void AuraMusClientTestBase::SetUp() {
24 EnableMus();
25 set_window_manager_delegate(nullptr);
26 AuraTestBase::SetUp();
19 } 27 }
20 28
21 } // namespace test 29 } // namespace test
22 } // namespace base 30 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_mus_test_base.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698