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

Side by Side Diff: ash/shelf/shelf.h

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 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 #ifndef ASH_SHELF_SHELF_H_ 5 #ifndef ASH_SHELF_SHELF_H_
6 #define ASH_SHELF_SHELF_H_ 6 #define ASH_SHELF_SHELF_H_
7 7
8 #include <memory>
oshima 2016/04/08 07:09:41 remove this?
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_constants.h" 11 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shelf/shelf_types.h" 12 #include "ash/shelf/shelf_types.h"
11 #include "ash/shelf/shelf_widget.h" 13 #include "ash/shelf/shelf_widget.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
15 #include "ui/views/widget/widget_observer.h" 16 #include "ui/views/widget/widget_observer.h"
16 17
17 namespace app_list { 18 namespace app_list {
18 class ApplicationDragAndDropHost; 19 class ApplicationDragAndDropHost;
19 } 20 }
20 21
21 namespace aura { 22 namespace aura {
22 class Window; 23 class Window;
23 } 24 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ShelfDelegate* delegate_; 154 ShelfDelegate* delegate_;
154 155
155 ShelfWidget* shelf_widget_; 156 ShelfWidget* shelf_widget_;
156 157
157 DISALLOW_COPY_AND_ASSIGN(Shelf); 158 DISALLOW_COPY_AND_ASSIGN(Shelf);
158 }; 159 };
159 160
160 } // namespace ash 161 } // namespace ash
161 162
162 #endif // ASH_SHELF_SHELF_H_ 163 #endif // ASH_SHELF_SHELF_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698