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

Side by Side Diff: ash/wm/overview/window_selector_unittest.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShelfTestAPI Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/launcher/launcher.h"
6 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
7 #include "ash/screen_ash.h" 6 #include "ash/screen_ash.h"
7 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_widget.h" 8 #include "ash/shelf/shelf_widget.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/test/launcher_test_api.h" 11 #include "ash/test/shelf_test_api.h"
12 #include "ash/test/shelf_view_test_api.h" 12 #include "ash/test/shelf_view_test_api.h"
13 #include "ash/test/shell_test_api.h" 13 #include "ash/test/shell_test_api.h"
14 #include "ash/test/test_shelf_delegate.h" 14 #include "ash/test/test_shelf_delegate.h"
15 #include "ash/wm/mru_window_tracker.h" 15 #include "ash/wm/mru_window_tracker.h"
16 #include "ash/wm/overview/window_selector.h" 16 #include "ash/wm/overview/window_selector.h"
17 #include "ash/wm/overview/window_selector_controller.h" 17 #include "ash/wm/overview/window_selector_controller.h"
18 #include "ash/wm/window_state.h" 18 #include "ash/wm/window_state.h"
19 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
20 #include "base/basictypes.h" 20 #include "base/basictypes.h"
21 #include "base/compiler_specific.h" 21 #include "base/compiler_specific.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 class WindowSelectorTest : public test::AshTestBase { 101 class WindowSelectorTest : public test::AshTestBase {
102 public: 102 public:
103 WindowSelectorTest() {} 103 WindowSelectorTest() {}
104 virtual ~WindowSelectorTest() {} 104 virtual ~WindowSelectorTest() {}
105 105
106 virtual void SetUp() OVERRIDE { 106 virtual void SetUp() OVERRIDE {
107 test::AshTestBase::SetUp(); 107 test::AshTestBase::SetUp();
108 ASSERT_TRUE(test::TestShelfDelegate::instance()); 108 ASSERT_TRUE(test::TestShelfDelegate::instance());
109 109
110 shelf_view_test_.reset(new test::ShelfViewTestAPI( 110 shelf_view_test_.reset(new test::ShelfViewTestAPI(
111 test::LauncherTestAPI(Launcher::ForPrimaryDisplay()).shelf_view())); 111 test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view()));
112 shelf_view_test_->SetAnimationDuration(1); 112 shelf_view_test_->SetAnimationDuration(1);
113 } 113 }
114 114
115 aura::Window* CreateWindow(const gfx::Rect& bounds) { 115 aura::Window* CreateWindow(const gfx::Rect& bounds) {
116 return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds); 116 return CreateTestWindowInShellWithDelegate(&delegate_, -1, bounds);
117 } 117 }
118 118
119 aura::Window* CreateNonActivatableWindow(const gfx::Rect& bounds) { 119 aura::Window* CreateNonActivatableWindow(const gfx::Rect& bounds) {
120 aura::Window* window = CreateWindow(bounds); 120 aura::Window* window = CreateWindow(bounds);
121 aura::client::SetActivationDelegate(window, 121 aura::client::SetActivationDelegate(window,
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 ToEnclosingRect(GetTransformedTargetBounds(window1.get())); 941 ToEnclosingRect(GetTransformedTargetBounds(window1.get()));
942 EXPECT_EQ(overview_bounds.x(), new_overview_bounds.x()); 942 EXPECT_EQ(overview_bounds.x(), new_overview_bounds.x());
943 EXPECT_EQ(overview_bounds.y(), new_overview_bounds.y()); 943 EXPECT_EQ(overview_bounds.y(), new_overview_bounds.y());
944 EXPECT_EQ(overview_bounds.width(), new_overview_bounds.width()); 944 EXPECT_EQ(overview_bounds.width(), new_overview_bounds.width());
945 EXPECT_EQ(overview_bounds.height(), new_overview_bounds.height()); 945 EXPECT_EQ(overview_bounds.height(), new_overview_bounds.height());
946 StopCycling(); 946 StopCycling();
947 } 947 }
948 948
949 } // namespace internal 949 } // namespace internal
950 } // namespace ash 950 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698