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

Side by Side Diff: ash/desktop_background/desktop_background_controller.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/debug.cc ('k') | ash/desktop_background/desktop_background_view.h » ('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_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_ 5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_ 6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/display/window_tree_host_manager.h" 11 #include "ash/display/window_tree_host_manager.h"
10 #include "ash/shell_observer.h" 12 #include "ash/shell_observer.h"
11 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
12 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
13 #include "base/macros.h" 15 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 17 #include "base/observer_list.h"
17 #include "base/timer/timer.h" 18 #include "base/timer/timer.h"
18 #include "components/wallpaper/wallpaper_layout.h" 19 #include "components/wallpaper/wallpaper_layout.h"
19 #include "ui/compositor/layer.h" 20 #include "ui/compositor/layer.h"
20 #include "ui/gfx/image/image_skia.h" 21 #include "ui/gfx/image/image_skia.h"
21 22
22 typedef unsigned int SkColor; 23 typedef unsigned int SkColor;
23 24
24 namespace aura { 25 namespace aura {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Can change at runtime. 150 // Can change at runtime.
150 bool locked_; 151 bool locked_;
151 152
152 BackgroundMode desktop_background_mode_; 153 BackgroundMode desktop_background_mode_;
153 154
154 SkColor background_color_; 155 SkColor background_color_;
155 156
156 base::ObserverList<DesktopBackgroundControllerObserver> observers_; 157 base::ObserverList<DesktopBackgroundControllerObserver> observers_;
157 158
158 // The current wallpaper. 159 // The current wallpaper.
159 scoped_ptr<wallpaper::WallpaperResizer> current_wallpaper_; 160 std::unique_ptr<wallpaper::WallpaperResizer> current_wallpaper_;
160 161
161 gfx::Size current_max_display_size_; 162 gfx::Size current_max_display_size_;
162 163
163 base::OneShotTimer timer_; 164 base::OneShotTimer timer_;
164 165
165 int wallpaper_reload_delay_; 166 int wallpaper_reload_delay_;
166 167
167 base::SequencedWorkerPool* blocking_pool_; 168 base::SequencedWorkerPool* blocking_pool_;
168 169
169 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController); 170 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
170 }; 171 };
171 172
172 } // namespace ash 173 } // namespace ash
173 174
174 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_ 175 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/debug.cc ('k') | ash/desktop_background/desktop_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698