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

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

Issue 465983002: Add shoftcut (ctrl-f6) to toggle split view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « athena/test/athena_test_base.h ('k') | athena/wm/split_view_controller.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 #include "athena/test/athena_test_base.h" 5 #include "athena/test/athena_test_base.h"
6 6
7 #include "athena/screen/public/screen_manager.h"
7 #include "athena/test/athena_test_helper.h" 8 #include "athena/test/athena_test_helper.h"
9 #include "ui/aura/client/window_tree_client.h"
8 #include "ui/aura/test/event_generator_delegate_aura.h" 10 #include "ui/aura/test/event_generator_delegate_aura.h"
11 #include "ui/aura/window.h"
9 #include "ui/compositor/test/context_factories_for_test.h" 12 #include "ui/compositor/test/context_factories_for_test.h"
10 13
11 #if defined(USE_X11) 14 #if defined(USE_X11)
12 #include "ui/aura/window_tree_host_x11.h" 15 #include "ui/aura/window_tree_host_x11.h"
13 #endif 16 #endif
14 17
15 namespace athena { 18 namespace athena {
16 namespace test { 19 namespace test {
17 20
18 AthenaTestBase::AthenaTestBase() 21 AthenaTestBase::AthenaTestBase()
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 55
53 helper_->TearDown(); 56 helper_->TearDown();
54 ui::TerminateContextFactoryForTests(); 57 ui::TerminateContextFactoryForTests();
55 testing::Test::TearDown(); 58 testing::Test::TearDown();
56 } 59 }
57 60
58 void AthenaTestBase::RunAllPendingInMessageLoop() { 61 void AthenaTestBase::RunAllPendingInMessageLoop() {
59 helper_->RunAllPendingInMessageLoop(); 62 helper_->RunAllPendingInMessageLoop();
60 } 63 }
61 64
65 scoped_ptr<aura::Window> AthenaTestBase::CreateTestWindow(
66 aura::WindowDelegate* delegate,
67 const gfx::Rect& bounds) {
68 scoped_ptr<aura::Window> window(new aura::Window(delegate));
69 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
70 window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
71 aura::client::ParentWindowWithContext(
72 window.get(), ScreenManager::Get()->GetContext(), bounds);
73 return window.Pass();
74 }
75
62 } // namespace test 76 } // namespace test
63 } // namespace athena 77 } // namespace athena
OLDNEW
« no previous file with comments | « athena/test/athena_test_base.h ('k') | athena/wm/split_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698