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

Side by Side Diff: ash/dip_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 <algorithm> 5 #include <algorithm>
6 #include <memory>
oshima 2016/04/08 07:09:39 not necessary?
6 #include <vector> 7 #include <vector>
7 8
8 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
9 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
10 #include "ash/shelf/shelf.h" 11 #include "ash/shelf/shelf.h"
11 #include "ash/shelf/shelf_widget.h" 12 #include "ash/shelf/shelf_widget.h"
12 #include "ash/shell.h" 13 #include "ash/shell.h"
13 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
14 #include "ash/wm/window_properties.h" 15 #include "ash/wm/window_properties.h"
15 #include "ash/wm/window_util.h" 16 #include "ash/wm/window_util.h"
16 #include "base/command_line.h" 17 #include "base/command_line.h"
17 #include "base/memory/scoped_ptr.h"
18 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
19 #include "ui/aura/window_event_dispatcher.h" 19 #include "ui/aura/window_event_dispatcher.h"
20 #include "ui/compositor/layer.h" 20 #include "ui/compositor/layer.h"
21 #include "ui/gfx/display.h" 21 #include "ui/gfx/display.h"
22 #include "ui/gfx/geometry/insets.h" 22 #include "ui/gfx/geometry/insets.h"
23 #include "ui/gfx/screen.h" 23 #include "ui/gfx/screen.h"
24 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
25 #include "ui/wm/core/shadow.h" 25 #include "ui/wm/core/shadow.h"
26 #include "ui/wm/core/shadow_controller.h" 26 #include "ui/wm/core/shadow_controller.h"
27 #include "ui/wm/core/shadow_types.h" 27 #include "ui/wm/core/shadow_types.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 // Sanity check if the workarea's inset hight is same as 70 // Sanity check if the workarea's inset hight is same as
71 // the shelf's height. 71 // the shelf's height.
72 Shelf* shelf = Shelf::ForPrimaryDisplay(); 72 Shelf* shelf = Shelf::ForPrimaryDisplay();
73 EXPECT_EQ( 73 EXPECT_EQ(
74 display_2x.bounds().InsetsFrom(work_area).height(), 74 display_2x.bounds().InsetsFrom(work_area).height(),
75 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height()); 75 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
76 } 76 }
77 77
78 } // namespace ash 78 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698