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

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

Issue 14305026: ash: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/desktop_background/wallpaper_resizer.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 #include "ash/desktop_background/desktop_background_controller.h" 5 #include "ash/desktop_background/desktop_background_controller.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller_observer.h" 7 #include "ash/desktop_background/desktop_background_controller_observer.h"
8 #include "ash/desktop_background/desktop_background_view.h" 8 #include "ash/desktop_background/desktop_background_view.h"
9 #include "ash/desktop_background/desktop_background_widget_controller.h" 9 #include "ash/desktop_background/desktop_background_widget_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 const WallpaperInfo info_; 115 const WallpaperInfo info_;
116 116
117 DISALLOW_COPY_AND_ASSIGN(WallpaperLoader); 117 DISALLOW_COPY_AND_ASSIGN(WallpaperLoader);
118 }; 118 };
119 119
120 DesktopBackgroundController::DesktopBackgroundController() 120 DesktopBackgroundController::DesktopBackgroundController()
121 : locked_(false), 121 : locked_(false),
122 desktop_background_mode_(BACKGROUND_NONE), 122 desktop_background_mode_(BACKGROUND_NONE),
123 background_color_(kTransparentColor), 123 background_color_(kTransparentColor),
124 weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { 124 weak_ptr_factory_(this) {
125 } 125 }
126 126
127 DesktopBackgroundController::~DesktopBackgroundController() { 127 DesktopBackgroundController::~DesktopBackgroundController() {
128 CancelPendingWallpaperOperation(); 128 CancelPendingWallpaperOperation();
129 } 129 }
130 130
131 gfx::ImageSkia DesktopBackgroundController::GetWallpaper() const { 131 gfx::ImageSkia DesktopBackgroundController::GetWallpaper() const {
132 if (current_wallpaper_) 132 if (current_wallpaper_)
133 return current_wallpaper_->wallpaper_image(); 133 return current_wallpaper_->wallpaper_image();
134 return gfx::ImageSkia(); 134 return gfx::ImageSkia();
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 return moved; 405 return moved;
406 } 406 }
407 407
408 int DesktopBackgroundController::GetBackgroundContainerId(bool locked) { 408 int DesktopBackgroundController::GetBackgroundContainerId(bool locked) {
409 return locked ? internal::kShellWindowId_LockScreenBackgroundContainer : 409 return locked ? internal::kShellWindowId_LockScreenBackgroundContainer :
410 internal::kShellWindowId_DesktopBackgroundContainer; 410 internal::kShellWindowId_DesktopBackgroundContainer;
411 } 411 }
412 412
413 } // namespace ash 413 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/desktop_background/wallpaper_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698