OLD | NEW |
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/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_observer.h" | 10 #include "ash/wm/workspace/workspace_observer.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 manager_.reset(new WorkspaceManager(viewport())); | 92 manager_.reset(new WorkspaceManager(viewport())); |
93 } | 93 } |
94 | 94 |
95 virtual void TearDown() OVERRIDE { | 95 virtual void TearDown() OVERRIDE { |
96 manager_.reset(); | 96 manager_.reset(); |
97 aura::test::AuraTestBase::TearDown(); | 97 aura::test::AuraTestBase::TearDown(); |
98 } | 98 } |
99 | 99 |
100 aura::Window* CreateTestWindow() { | 100 aura::Window* CreateTestWindow() { |
101 aura::Window* window = new aura::Window(NULL); | 101 aura::Window* window = new aura::Window(NULL); |
102 window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); | 102 window->Init(ui::Layer::LAYER_NOT_DRAWN); |
103 return window; | 103 return window; |
104 } | 104 } |
105 | 105 |
106 aura::Window* viewport() { | 106 aura::Window* viewport() { |
107 return aura::RootWindow::GetInstance(); | 107 return aura::RootWindow::GetInstance(); |
108 } | 108 } |
109 scoped_ptr<WorkspaceManager> manager_; | 109 scoped_ptr<WorkspaceManager> manager_; |
110 | 110 |
111 private: | 111 private: |
112 scoped_ptr<internal::ActivationController> activation_controller_; | 112 scoped_ptr<internal::ActivationController> activation_controller_; |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 | 558 |
559 w2->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); | 559 w2->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); |
560 EXPECT_TRUE(ws->ContainsFullscreenWindow()); | 560 EXPECT_TRUE(ws->ContainsFullscreenWindow()); |
561 | 561 |
562 w2->Hide(); | 562 w2->Hide(); |
563 EXPECT_FALSE(ws->ContainsFullscreenWindow()); | 563 EXPECT_FALSE(ws->ContainsFullscreenWindow()); |
564 } | 564 } |
565 | 565 |
566 } // namespace internal | 566 } // namespace internal |
567 } // namespace ash | 567 } // namespace ash |
OLD | NEW |