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

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

Issue 115153002: wm: public window_types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ozone deps Created 7 years 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 | « ui/aura/client/window_types.h ('k') | ui/aura/test/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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/aura/test/aura_test_base.h" 5 #include "ui/aura/test/aura_test_base.h"
6 6
7 #include "ui/aura/client/window_tree_client.h" 7 #include "ui/aura/client/window_tree_client.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/test/aura_test_helper.h" 9 #include "ui/aura/test/aura_test_helper.h"
10 #include "ui/aura/test/test_window_delegate.h" 10 #include "ui/aura/test/test_window_delegate.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 window->Init(ui::LAYER_TEXTURED); 93 window->Init(ui::LAYER_TEXTURED);
94 parent->AddChild(window); 94 parent->AddChild(window);
95 window->SetBounds(gfx::Rect(0, 0, 100, 100)); 95 window->SetBounds(gfx::Rect(0, 0, 100, 100));
96 window->Show(); 96 window->Show();
97 return window; 97 return window;
98 } 98 }
99 99
100 Window* AuraTestBase::CreateTransientChild(int id, Window* parent) { 100 Window* AuraTestBase::CreateTransientChild(int id, Window* parent) {
101 Window* window = new Window(NULL); 101 Window* window = new Window(NULL);
102 window->set_id(id); 102 window->set_id(id);
103 window->SetType(aura::client::WINDOW_TYPE_NORMAL); 103 window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
104 window->Init(ui::LAYER_TEXTURED); 104 window->Init(ui::LAYER_TEXTURED);
105 aura::client::ParentWindowWithContext(window, root_window(), gfx::Rect()); 105 aura::client::ParentWindowWithContext(window, root_window(), gfx::Rect());
106 parent->AddTransientChild(window); 106 parent->AddTransientChild(window);
107 return window; 107 return window;
108 } 108 }
109 109
110 void AuraTestBase::RunAllPendingInMessageLoop() { 110 void AuraTestBase::RunAllPendingInMessageLoop() {
111 helper_->RunAllPendingInMessageLoop(); 111 helper_->RunAllPendingInMessageLoop();
112 } 112 }
113 113
114 void AuraTestBase::ParentWindow(Window* window) { 114 void AuraTestBase::ParentWindow(Window* window) {
115 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); 115 client::ParentWindowWithContext(window, root_window(), gfx::Rect());
116 } 116 }
117 117
118 } // namespace test 118 } // namespace test
119 } // namespace aura 119 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/window_types.h ('k') | ui/aura/test/test_windows.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698