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

Side by Side Diff: ash/wm/workspace_controller_unittest.cc

Issue 9289036: aura: Add Layer::LAYER_SOLID_COLOR to compositor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor changes Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_controller.h" 5 #include "ash/wm/workspace_controller.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/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "ash/wm/workspace/workspace.h" 10 #include "ash/wm/workspace/workspace.h"
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 37
38 virtual void TearDown() OVERRIDE { 38 virtual void TearDown() OVERRIDE {
39 activation_controller_.reset(); 39 activation_controller_.reset();
40 controller_.reset(); 40 controller_.reset();
41 aura::test::AuraTestBase::TearDown(); 41 aura::test::AuraTestBase::TearDown();
42 } 42 }
43 43
44 aura::Window* CreateTestWindow() { 44 aura::Window* CreateTestWindow() {
45 aura::Window* window = new aura::Window(NULL); 45 aura::Window* window = new aura::Window(NULL);
46 window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); 46 window->Init(ui::Layer::LAYER_NOT_DRAWN);
47 contents_view()->AddChild(window); 47 contents_view()->AddChild(window);
48 window->Show(); 48 window->Show();
49 return window; 49 return window;
50 } 50 }
51 51
52 aura::Window* contents_view() { 52 aura::Window* contents_view() {
53 return contents_view_; 53 return contents_view_;
54 } 54 }
55 55
56 WorkspaceManager* workspace_manager() { 56 WorkspaceManager* workspace_manager() {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // The size of contents_view() for no workspace case must be 110 // The size of contents_view() for no workspace case must be
111 // same as one contents_view() case. 111 // same as one contents_view() case.
112 EXPECT_EQ("0,0 500x300", contents_view()->bounds().ToString()); 112 EXPECT_EQ("0,0 500x300", contents_view()->bounds().ToString());
113 113
114 // Reset now before windows are destroyed. 114 // Reset now before windows are destroyed.
115 controller_.reset(); 115 controller_.reset();
116 } 116 }
117 117
118 } // namespace internal 118 } // namespace internal
119 } // namespace ash 119 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698