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

Side by Side Diff: ash/dip_unittest.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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
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/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
11 #include "ash/shelf/shelf_widget.h" 11 #include "ash/shelf/shelf_widget.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/wm/window_properties.h" 14 #include "ash/wm/window_properties.h"
15 #include "ash/wm/window_util.h" 15 #include "ash/wm/window_util.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "ui/aura/client/activation_client.h" 18 #include "ui/aura/client/activation_client.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/aura/window_event_dispatcher.h" 20 #include "ui/aura/window_event_dispatcher.h"
21 #include "ui/compositor/layer.h" 21 #include "ui/compositor/layer.h"
22 #include "ui/gfx/display.h" 22 #include "ui/gfx/display.h"
23 #include "ui/gfx/insets.h" 23 #include "ui/gfx/insets.h"
24 #include "ui/gfx/screen.h" 24 #include "ui/gfx/screen.h"
25 #include "ui/views/corewm/shadow.h"
26 #include "ui/views/corewm/shadow_controller.h"
27 #include "ui/views/corewm/shadow_types.h"
28 #include "ui/views/widget/widget.h" 25 #include "ui/views/widget/widget.h"
26 #include "ui/wm/core/shadow.h"
27 #include "ui/wm/core/shadow_controller.h"
28 #include "ui/wm/core/shadow_types.h"
29 29
30 namespace ash { 30 namespace ash {
31 31
32 typedef ash::test::AshTestBase DIPTest; 32 typedef ash::test::AshTestBase DIPTest;
33 33
34 // Test if the WM sets correct work area under different density. 34 // Test if the WM sets correct work area under different density.
35 TEST_F(DIPTest, WorkArea) { 35 TEST_F(DIPTest, WorkArea) {
36 UpdateDisplay("1000x900*1.0f"); 36 UpdateDisplay("1000x900*1.0f");
37 37
38 aura::Window* root = Shell::GetPrimaryRootWindow(); 38 aura::Window* root = Shell::GetPrimaryRootWindow();
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // Sanity check if the workarea's inset hight is same as 103 // Sanity check if the workarea's inset hight is same as
104 // the shelf's height. 104 // the shelf's height.
105 Shelf* shelf = Shelf::ForPrimaryDisplay(); 105 Shelf* shelf = Shelf::ForPrimaryDisplay();
106 EXPECT_EQ( 106 EXPECT_EQ(
107 display_2x.bounds().InsetsFrom(work_area).height(), 107 display_2x.bounds().InsetsFrom(work_area).height(),
108 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height()); 108 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
109 } 109 }
110 110
111 } // namespace ash 111 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/user_wallpaper_delegate.h ('k') | ash/display/screen_position_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698