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

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

Issue 662763002: Support modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: fix leaks 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/base/athena_test_base.h ('k') | athena/test/base/test_windows.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 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 #include "athena/test/base/athena_test_base.h" 5 #include "athena/test/base/athena_test_base.h"
6 6
7 #include "athena/env/public/athena_env.h" 7 #include "athena/env/public/athena_env.h"
8 #include "athena/screen/public/screen_manager.h"
9 #include "athena/test/base/athena_test_helper.h" 8 #include "athena/test/base/athena_test_helper.h"
10 #include "ui/aura/client/window_tree_client.h"
11 #include "ui/aura/test/event_generator_delegate_aura.h" 9 #include "ui/aura/test/event_generator_delegate_aura.h"
12 #include "ui/aura/window.h"
13 #include "ui/compositor/test/context_factories_for_test.h" 10 #include "ui/compositor/test/context_factories_for_test.h"
14 11
15 #if defined(USE_X11) 12 #if defined(USE_X11)
16 #include "ui/aura/window_tree_host_x11.h" 13 #include "ui/aura/window_tree_host_x11.h"
17 #endif 14 #endif
18 15
19 namespace athena { 16 namespace athena {
20 namespace test { 17 namespace test {
21 18
22 AthenaTestBase::AthenaTestBase() 19 AthenaTestBase::AthenaTestBase()
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 55
59 helper_->TearDown(); 56 helper_->TearDown();
60 ui::TerminateContextFactoryForTests(); 57 ui::TerminateContextFactoryForTests();
61 testing::Test::TearDown(); 58 testing::Test::TearDown();
62 } 59 }
63 60
64 void AthenaTestBase::RunAllPendingInMessageLoop() { 61 void AthenaTestBase::RunAllPendingInMessageLoop() {
65 helper_->RunAllPendingInMessageLoop(); 62 helper_->RunAllPendingInMessageLoop();
66 } 63 }
67 64
68 scoped_ptr<aura::Window> AthenaTestBase::CreateTestWindow(
69 aura::WindowDelegate* delegate,
70 const gfx::Rect& bounds) {
71 scoped_ptr<aura::Window> window(new aura::Window(delegate));
72 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
73 window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
74 aura::client::ParentWindowWithContext(
75 window.get(), ScreenManager::Get()->GetContext(), bounds);
76 return window.Pass();
77 }
78
79 } // namespace test 65 } // namespace test
80 } // namespace athena 66 } // namespace athena
OLDNEW
« no previous file with comments | « athena/test/base/athena_test_base.h ('k') | athena/test/base/test_windows.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698