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

Side by Side Diff: ash/wm/workspace/workspace_manager_unittest.cc

Issue 9289036: aura: Add Layer::LAYER_SOLID_COLOR to compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update WorkspaceManagerTest Created 8 years, 10 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
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 "ash/wm/workspace/workspace_manager.h" 5 #include "ash/wm/workspace/workspace_manager.h"
6 6
7 #include "ash/shell_window_ids.h" 7 #include "ash/shell_window_ids.h"
8 #include "ash/wm/activation_controller.h" 8 #include "ash/wm/activation_controller.h"
9 #include "ash/wm/workspace/workspace.h" 9 #include "ash/wm/workspace/workspace.h"
10 #include "ash/wm/workspace/workspace_layout_manager.h" 10 #include "ash/wm/workspace/workspace_layout_manager.h"
(...skipping 28 matching lines...) Expand all
39 } 39 }
40 40
41 virtual void TearDown() OVERRIDE { 41 virtual void TearDown() OVERRIDE {
42 manager_.reset(); 42 manager_.reset();
43 aura::test::AuraTestBase::TearDown(); 43 aura::test::AuraTestBase::TearDown();
44 } 44 }
45 45
46 aura::Window* CreateTestWindow() { 46 aura::Window* CreateTestWindow() {
47 aura::Window* window = new aura::Window(NULL); 47 aura::Window* window = new aura::Window(NULL);
48 window->SetType(aura::client::WINDOW_TYPE_NORMAL); 48 window->SetType(aura::client::WINDOW_TYPE_NORMAL);
49 window->Init(ui::Layer::LAYER_HAS_TEXTURE); 49 window->Init(ui::Layer::LAYER_TEXTURED);
50 window->SetParent(viewport()); 50 window->SetParent(viewport());
51 return window; 51 return window;
52 } 52 }
53 53
54 aura::Window* viewport() { 54 aura::Window* viewport() {
55 return aura::RootWindow::GetInstance(); 55 return aura::RootWindow::GetInstance();
56 } 56 }
57 57
58 const std::vector<Workspace*>& workspaces() const { 58 const std::vector<Workspace*>& workspaces() const {
59 return manager_->workspaces_; 59 return manager_->workspaces_;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 EXPECT_TRUE(manager_->IsManagedWindow(w1.get())); 279 EXPECT_TRUE(manager_->IsManagedWindow(w1.get()));
280 // Setting the bounds should go through since the window is in the normal 280 // Setting the bounds should go through since the window is in the normal
281 // workspace. 281 // workspace.
282 w1->SetBounds(gfx::Rect(0, 0, 200, 500)); 282 w1->SetBounds(gfx::Rect(0, 0, 200, 500));
283 EXPECT_EQ(200, w1->bounds().width()); 283 EXPECT_EQ(200, w1->bounds().width());
284 EXPECT_EQ(500, w1->bounds().height()); 284 EXPECT_EQ(500, w1->bounds().height());
285 } 285 }
286 286
287 } // namespace internal 287 } // namespace internal
288 } // namespace ash 288 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/toplevel_window_event_filter_unittest.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698