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

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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 (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/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/wm/window_state.h" 12 #include "ash/common/wm/window_state.h"
12 #include "ash/display/display_manager.h" 13 #include "ash/display/display_manager.h"
13 #include "ash/display/window_tree_host_manager.h" 14 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/focus_cycler.h" 15 #include "ash/focus_cycler.h"
15 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
16 #include "ash/session/session_state_delegate.h"
17 #include "ash/shelf/shelf.h" 17 #include "ash/shelf/shelf.h"
18 #include "ash/shelf/shelf_layout_manager_observer.h" 18 #include "ash/shelf/shelf_layout_manager_observer.h"
19 #include "ash/shelf/shelf_locking_manager.h" 19 #include "ash/shelf/shelf_locking_manager.h"
20 #include "ash/shelf/shelf_view.h" 20 #include "ash/shelf/shelf_view.h"
21 #include "ash/shelf/shelf_widget.h" 21 #include "ash/shelf/shelf_widget.h"
22 #include "ash/shell.h" 22 #include "ash/shell.h"
23 #include "ash/system/status_area_widget.h" 23 #include "ash/system/status_area_widget.h"
24 #include "ash/system/tray/system_tray.h" 24 #include "ash/system/tray/system_tray.h"
25 #include "ash/system/tray/system_tray_item.h" 25 #include "ash/system/tray/system_tray_item.h"
26 #include "ash/test/ash_test_base.h" 26 #include "ash/test/ash_test_base.h"
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after
2297 ->shelf_widget() 2297 ->shelf_widget()
2298 ->status_area_widget(); 2298 ->status_area_widget();
2299 EXPECT_TRUE(status_area_widget->IsVisible()); 2299 EXPECT_TRUE(status_area_widget->IsVisible());
2300 // Shelf should be in the first display's area. 2300 // Shelf should be in the first display's area.
2301 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen()); 2301 gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());
2302 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds)); 2302 EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));
2303 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right()); 2303 EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());
2304 } 2304 }
2305 2305
2306 } // namespace ash 2306 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698