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

Side by Side Diff: athena/test/base/athena_test_base.h

Issue 665803003: Revert of Support modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 | « athena/test/DEPS ('k') | athena/test/base/athena_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_ 5 #ifndef ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_
6 #define ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_ 6 #define ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_
7 7
8 #include "athena/test/base/athena_test_helper.h" 8 #include "athena/test/base/athena_test_helper.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 13 matching lines...) Expand all
24 AthenaTestBase(); 24 AthenaTestBase();
25 virtual ~AthenaTestBase(); 25 virtual ~AthenaTestBase();
26 26
27 // testing::Test: 27 // testing::Test:
28 virtual void SetUp() override; 28 virtual void SetUp() override;
29 virtual void TearDown() override; 29 virtual void TearDown() override;
30 30
31 protected: 31 protected:
32 void RunAllPendingInMessageLoop(); 32 void RunAllPendingInMessageLoop();
33 33
34 scoped_ptr<aura::Window> CreateTestWindow(aura::WindowDelegate* delegate,
35 const gfx::Rect& bounds);
36
34 aura::Window* root_window() { return helper_->GetRootWindow(); } 37 aura::Window* root_window() { return helper_->GetRootWindow(); }
35 aura::WindowTreeHost* host() { return helper_->GetHost(); } 38 aura::WindowTreeHost* host() { return helper_->GetHost(); }
36 39
37 private: 40 private:
38 bool setup_called_; 41 bool setup_called_;
39 bool teardown_called_; 42 bool teardown_called_;
40 43
41 base::MessageLoopForUI message_loop_; 44 base::MessageLoopForUI message_loop_;
42 scoped_ptr<AthenaTestHelper> helper_; 45 scoped_ptr<AthenaTestHelper> helper_;
43 46
44 DISALLOW_COPY_AND_ASSIGN(AthenaTestBase); 47 DISALLOW_COPY_AND_ASSIGN(AthenaTestBase);
45 }; 48 };
46 49
47 } // namespace test 50 } // namespace test
48 } // namespace athena 51 } // namespace athena
49 52
50 #endif // ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_ 53 #endif // ATHENA_TEST_BASE_ATHENA_TEST_BASE_H_
OLDNEW
« no previous file with comments | « athena/test/DEPS ('k') | athena/test/base/athena_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698