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

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

Issue 9600006: Aura: Remove overlapping window mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « ash/wm/workspace/workspace_event_filter_unittest.cc ('k') | chrome/app/generated_resources.grd » ('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 "ash/wm/workspace/workspace_manager.h" 5 #include "ash/wm/workspace/workspace_manager.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/wm/activation_controller.h" 10 #include "ash/wm/activation_controller.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 virtual void TearDown() OVERRIDE { 82 virtual void TearDown() OVERRIDE {
83 manager_ = NULL; 83 manager_ = NULL;
84 test::AshTestBase::TearDown(); 84 test::AshTestBase::TearDown();
85 } 85 }
86 86
87 protected: 87 protected:
88 internal::WorkspaceManager* manager_; 88 internal::WorkspaceManager* manager_;
89 89
90 private: 90 private:
91 virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode) OVERRIDE {
92 *window_mode = Shell::MODE_MANAGED;
93 return true;
94 }
95
96 scoped_ptr<internal::ActivationController> activation_controller_; 91 scoped_ptr<internal::ActivationController> activation_controller_;
97 92
98 DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTest); 93 DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTest);
99 }; 94 };
100 95
101 // Assertions around adding a normal window. 96 // Assertions around adding a normal window.
102 TEST_F(WorkspaceManagerTest, AddNormalWindowWhenEmpty) { 97 TEST_F(WorkspaceManagerTest, AddNormalWindowWhenEmpty) {
103 scoped_ptr<Window> w1(CreateTestWindow()); 98 scoped_ptr<Window> w1(CreateTestWindow());
104 w1->SetBounds(gfx::Rect(0, 0, 250, 251)); 99 w1->SetBounds(gfx::Rect(0, 0, 250, 251));
105 100
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 EXPECT_TRUE(w3->layer()->IsDrawn()); 407 EXPECT_TRUE(w3->layer()->IsDrawn());
413 408
414 w1->Show(); 409 w1->Show();
415 EXPECT_TRUE(w1->layer()->IsDrawn()); 410 EXPECT_TRUE(w1->layer()->IsDrawn());
416 EXPECT_FALSE(w2->layer()->IsDrawn()); 411 EXPECT_FALSE(w2->layer()->IsDrawn());
417 EXPECT_FALSE(w3->layer()->IsDrawn()); 412 EXPECT_FALSE(w3->layer()->IsDrawn());
418 } 413 }
419 414
420 } // namespace internal 415 } // namespace internal
421 } // namespace ash 416 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_event_filter_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698