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/wm/overview/window_selector_item.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_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 5 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 6 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/wm/overview/scoped_transform_overview_window.h" 11 #include "ash/wm/overview/scoped_transform_overview_window.h"
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "ui/aura/scoped_window_targeter.h" 14 #include "ui/aura/scoped_window_targeter.h"
14 #include "ui/aura/window_observer.h" 15 #include "ui/aura/window_observer.h"
15 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
16 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
17 #include "ui/views/controls/button/image_button.h" 18 #include "ui/views/controls/button/image_button.h"
18 #include "ui/views/controls/button/label_button.h" 19 #include "ui/views/controls/button/label_button.h"
19 20
20 namespace aura { 21 namespace aura {
21 class Window; 22 class Window;
22 } 23 }
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 144
144 // The target bounds this selector item is fit within. 145 // The target bounds this selector item is fit within.
145 gfx::Rect target_bounds_; 146 gfx::Rect target_bounds_;
146 147
147 // True if running SetItemBounds. This prevents recursive calls resulting from 148 // True if running SetItemBounds. This prevents recursive calls resulting from
148 // the bounds update when calling ::wm::RecreateWindowLayers to copy 149 // the bounds update when calling ::wm::RecreateWindowLayers to copy
149 // a window layer for display on another monitor. 150 // a window layer for display on another monitor.
150 bool in_bounds_update_; 151 bool in_bounds_update_;
151 152
152 // Label under the window displaying its active tab name. 153 // Label under the window displaying its active tab name.
153 scoped_ptr<views::Widget> window_label_; 154 std::unique_ptr<views::Widget> window_label_;
154 155
155 // View for the label under the window. 156 // View for the label under the window.
156 OverviewLabelButton* window_label_button_view_; 157 OverviewLabelButton* window_label_button_view_;
157 158
158 // The close buttons widget container. 159 // The close buttons widget container.
159 views::Widget close_button_widget_; 160 views::Widget close_button_widget_;
160 161
161 // An easy to access close button for the window in this item. Owned by the 162 // An easy to access close button for the window in this item. Owned by the
162 // close_button_widget_. 163 // close_button_widget_.
163 views::ImageButton* close_button_; 164 views::ImageButton* close_button_;
164 165
165 // Pointer to the WindowSelector that owns the WindowGrid containing |this|. 166 // Pointer to the WindowSelector that owns the WindowGrid containing |this|.
166 // Guaranteed to be non-null for the lifetime of |this|. 167 // Guaranteed to be non-null for the lifetime of |this|.
167 WindowSelector* window_selector_; 168 WindowSelector* window_selector_;
168 169
169 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem); 170 DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
170 }; 171 };
171 172
172 } // namespace ash 173 } // namespace ash
173 174
174 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_ 175 #endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_controller.h ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698