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

Side by Side Diff: ash/shelf/shelf_widget.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
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.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 #ifndef ASH_SHELF_SHELF_WIDGET_H_ 5 #ifndef ASH_SHELF_SHELF_WIDGET_H_
6 #define ASH_SHELF_SHELF_WIDGET_H_ 6 #define ASH_SHELF_SHELF_WIDGET_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 11 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_layout_manager_observer.h" 12 #include "ash/shelf/shelf_layout_manager_observer.h"
11 #include "ash/shelf/shelf_types.h" 13 #include "ash/shelf/shelf_types.h"
12 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
13 #include "ui/views/widget/widget_observer.h" 15 #include "ui/views/widget/widget_observer.h"
14 16
15 namespace aura { 17 namespace aura {
16 class Window; 18 class Window;
17 } 19 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // Disable dimming animations for running tests. 95 // Disable dimming animations for running tests.
94 void DisableDimmingAnimationsForTest(); 96 void DisableDimmingAnimationsForTest();
95 97
96 // ShelfLayoutManagerObserver overrides: 98 // ShelfLayoutManagerObserver overrides:
97 void WillDeleteShelf() override; 99 void WillDeleteShelf() override;
98 100
99 private: 101 private:
100 class DelegateView; 102 class DelegateView;
101 103
102 ShelfLayoutManager* shelf_layout_manager_; 104 ShelfLayoutManager* shelf_layout_manager_;
103 scoped_ptr<Shelf> shelf_; 105 std::unique_ptr<Shelf> shelf_;
104 StatusAreaWidget* status_area_widget_; 106 StatusAreaWidget* status_area_widget_;
105 107
106 // delegate_view_ is attached to window_container_ and is cleaned up 108 // delegate_view_ is attached to window_container_ and is cleaned up
107 // during CloseChildWindows of the associated RootWindowController. 109 // during CloseChildWindows of the associated RootWindowController.
108 DelegateView* delegate_view_; 110 DelegateView* delegate_view_;
109 BackgroundAnimator background_animator_; 111 BackgroundAnimator background_animator_;
110 bool activating_as_fallback_; 112 bool activating_as_fallback_;
111 aura::Window* window_container_; 113 aura::Window* window_container_;
112 }; 114 };
113 115
114 } // namespace ash 116 } // namespace ash
115 117
116 #endif // ASH_SHELF_SHELF_WIDGET_H_ 118 #endif // ASH_SHELF_SHELF_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698