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

Side by Side Diff: ash/desktop_background/desktop_background_controller.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 (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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/display/display_controller.h" 9 #include "ash/display/display_controller.h"
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 wallpaper_reload_delay_ = value; 141 wallpaper_reload_delay_ = value;
142 } 142 }
143 143
144 // Can change at runtime. 144 // Can change at runtime.
145 bool locked_; 145 bool locked_;
146 146
147 BackgroundMode desktop_background_mode_; 147 BackgroundMode desktop_background_mode_;
148 148
149 SkColor background_color_; 149 SkColor background_color_;
150 150
151 ObserverList<DesktopBackgroundControllerObserver> observers_; 151 base::ObserverList<DesktopBackgroundControllerObserver> observers_;
152 152
153 // The current wallpaper. 153 // The current wallpaper.
154 scoped_ptr<wallpaper::WallpaperResizer> current_wallpaper_; 154 scoped_ptr<wallpaper::WallpaperResizer> current_wallpaper_;
155 155
156 gfx::Size current_max_display_size_; 156 gfx::Size current_max_display_size_;
157 157
158 base::OneShotTimer<DesktopBackgroundController> timer_; 158 base::OneShotTimer<DesktopBackgroundController> timer_;
159 159
160 int wallpaper_reload_delay_; 160 int wallpaper_reload_delay_;
161 161
162 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController); 162 DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
163 }; 163 };
164 164
165 } // namespace ash 165 } // namespace ash
166 166
167 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_ 167 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos.h ('k') | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698