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

Unified Diff: ui/aura_shell/default_container_layout_manager_unittest.cc

Issue 8417008: aura: Add fullscreen/popups to RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura_shell/default_container_layout_manager.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/default_container_layout_manager_unittest.cc
diff --git a/ui/aura_shell/default_container_layout_manager_unittest.cc b/ui/aura_shell/default_container_layout_manager_unittest.cc
index d3dcd056511b9d6acee3939bafc49be7775fbea9..ca9d11ee9892adec4f2b082b07c97d42e46b91f0 100644
--- a/ui/aura_shell/default_container_layout_manager_unittest.cc
+++ b/ui/aura_shell/default_container_layout_manager_unittest.cc
@@ -41,11 +41,8 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
aura::Window* CreateTestWindowWithType(const gfx::Rect& bounds,
aura::Window* parent,
- Widget::InitParams::Type type) {
+ aura::WindowType type) {
aura::Window* window = new aura::Window(NULL);
- props_.push_back(new ui::ViewProp(
- window, views::NativeWidgetAura::kWindowTypeKey,
- reinterpret_cast<void*>(type)));
window->SetType(type);
window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
window->SetBounds(bounds);
@@ -58,7 +55,7 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
aura::Window* parent) {
return CreateTestWindowWithType(bounds,
parent,
- Widget::InitParams::TYPE_WINDOW);
+ aura::WINDOW_TYPE_NORMAL);
}
aura::Window* container() { return container_.get(); }
@@ -69,7 +66,6 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
protected:
scoped_ptr<aura::Window> container_;
- ScopedVector<ui::ViewProp> props_;
scoped_ptr<aura_shell::internal::WorkspaceController> workspace_controller_;
private:
@@ -124,7 +120,7 @@ TEST_F(DefaultContainerLayoutManagerTest, Popup) {
scoped_ptr<aura::Window> popup(
CreateTestWindowWithType(gfx::Rect(0, -1000, 100, 100),
container(),
- Widget::InitParams::TYPE_POPUP));
+ aura::WINDOW_TYPE_POPUP));
// A popup window can be placed outside of draggable area.
EXPECT_EQ("0,-1000 100x100", popup->bounds().ToString());
« no previous file with comments | « ui/aura_shell/default_container_layout_manager.cc ('k') | ui/aura_shell/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698