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

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: address comments 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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/shelf_constants.h" 9 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
11 #include "ash/shelf/shelf_widget.h" 11 #include "ash/shelf/shelf_widget.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
15 #include "ui/views/widget/widget_observer.h" 14 #include "ui/views/widget/widget_observer.h"
16 15
17 namespace app_list { 16 namespace app_list {
18 class ApplicationDragAndDropHost; 17 class ApplicationDragAndDropHost;
19 } 18 }
20 19
21 namespace aura { 20 namespace aura {
22 class Window; 21 class Window;
23 } 22 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ShelfDelegate* delegate_; 152 ShelfDelegate* delegate_;
154 153
155 ShelfWidget* shelf_widget_; 154 ShelfWidget* shelf_widget_;
156 155
157 DISALLOW_COPY_AND_ASSIGN(Shelf); 156 DISALLOW_COPY_AND_ASSIGN(Shelf);
158 }; 157 };
159 158
160 } // namespace ash 159 } // namespace ash
161 160
162 #endif // ASH_SHELF_SHELF_H_ 161 #endif // ASH_SHELF_SHELF_H_
OLDNEW
« no previous file with comments | « ash/shelf/scoped_observer_with_duplicated_sources_unittest.cc ('k') | ash/shelf/shelf_button_pressed_metric_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698