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

Side by Side Diff: ash/dip_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 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
« no previous file with comments | « ash/devtools/ash_devtools_unittest.cc ('k') | ash/display/cursor_window_controller.cc » ('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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/common/shelf/shelf_widget.h" 8 #include "ash/shelf/shelf_widget.h"
9 #include "ash/common/shelf/wm_shelf.h" 9 #include "ash/shelf/wm_shelf.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "ash/wm/window_properties.h" 12 #include "ash/wm/window_properties.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/aura/window_event_dispatcher.h" 16 #include "ui/aura/window_event_dispatcher.h"
17 #include "ui/compositor/layer.h" 17 #include "ui/compositor/layer.h"
18 #include "ui/display/display.h" 18 #include "ui/display/display.h"
19 #include "ui/display/manager/display_manager.h" 19 #include "ui/display/manager/display_manager.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 display_2x.bounds().InsetsFrom(work_area).ToString()); 61 display_2x.bounds().InsetsFrom(work_area).ToString());
62 62
63 // Sanity check if the workarea's inset hight is same as 63 // Sanity check if the workarea's inset hight is same as
64 // the shelf's height. 64 // the shelf's height.
65 WmShelf* shelf = GetPrimaryShelf(); 65 WmShelf* shelf = GetPrimaryShelf();
66 EXPECT_EQ(display_2x.bounds().InsetsFrom(work_area).height(), 66 EXPECT_EQ(display_2x.bounds().InsetsFrom(work_area).height(),
67 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height()); 67 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
68 } 68 }
69 69
70 } // namespace ash 70 } // namespace ash
OLDNEW
« no previous file with comments | « ash/devtools/ash_devtools_unittest.cc ('k') | ash/display/cursor_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698