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

Side by Side Diff: ash/common/shelf/shelf_window_watcher_unittest.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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
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/common/shelf/shelf_window_watcher.h" 5 #include "ash/common/shelf/shelf_window_watcher.h"
6 6
7 #include "ash/common/ash_switches.h"
8 #include "ash/common/shelf/shelf_item_types.h" 7 #include "ash/common/shelf/shelf_item_types.h"
9 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
10 #include "ash/common/shell_window_ids.h" 9 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/wm/window_resizer.h" 10 #include "ash/common/wm/window_resizer.h"
12 #include "ash/common/wm/window_state.h" 11 #include "ash/common/wm/window_state.h"
13 #include "ash/common/wm_lookup.h" 12 #include "ash/common/wm_lookup.h"
14 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
15 #include "ash/common/wm_window.h" 14 #include "ash/common/wm_window.h"
16 #include "ash/test/ash_test_base.h" 15 #include "ash/test/ash_test_base.h"
17 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 ASSERT_TRUE(resizer.get()); 262 ASSERT_TRUE(resizer.get());
264 resizer->Drag(gfx::Point(50, 50), 0); 263 resizer->Drag(gfx::Point(50, 50), 0);
265 resizer->CompleteDrag(); 264 resizer->CompleteDrag();
266 265
267 // Index and id are not changed after dragging a |window|. 266 // Index and id are not changed after dragging a |window|.
268 EXPECT_EQ(index, model_->ItemIndexByID(id)); 267 EXPECT_EQ(index, model_->ItemIndexByID(id));
269 EXPECT_EQ(id, model_->items()[index].id); 268 EXPECT_EQ(id, model_->items()[index].id);
270 } 269 }
271 270
272 } // namespace ash 271 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698