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

Unified Diff: ash/desktop_background/desktop_background_controller.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/desktop_background/desktop_background_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 602d0e24b47c29434409ebf5b0dcaed5ca5c2229..4f9780673190f892db7adcd9256a335775fe5c66 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -101,8 +101,7 @@ bool DesktopBackgroundController::SetWallpaperImage(const gfx::ImageSkia& image,
image, GetMaxDisplaySizeInNative(), layout, blocking_pool_));
current_wallpaper_->StartResize();
- FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver,
- observers_,
+ FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver, observers_,
OnWallpaperDataChanged());
SetDesktopBackgroundImageMode();
return true;
@@ -226,8 +225,9 @@ void DesktopBackgroundController::InstallDesktopController(
NOTREACHED();
return;
}
- GetRootWindowController(root_window)->SetAnimatingWallpaperController(
- new AnimatingDesktopController(component));
+ GetRootWindowController(root_window)
+ ->SetAnimatingWallpaperController(
+ new AnimatingDesktopController(component));
component->StartAnimating(GetRootWindowController(root_window));
}
@@ -247,7 +247,7 @@ bool DesktopBackgroundController::ReparentBackgroundWidgets(int src_container,
Shell::RootWindowControllerList controllers =
Shell::GetAllRootWindowControllers();
for (Shell::RootWindowControllerList::iterator iter = controllers.begin();
- iter != controllers.end(); ++iter) {
+ iter != controllers.end(); ++iter) {
RootWindowController* root_window_controller = *iter;
// In the steady state (no animation playing) the background widget
// controller exists in the RootWindowController.
@@ -256,8 +256,7 @@ bool DesktopBackgroundController::ReparentBackgroundWidgets(int src_container,
if (desktop_controller) {
moved |=
desktop_controller->Reparent(root_window_controller->GetRootWindow(),
- src_container,
- dst_container);
+ src_container, dst_container);
}
// During desktop show animations the controller lives in
// AnimatingDesktopController owned by RootWindowController.
@@ -265,14 +264,13 @@ bool DesktopBackgroundController::ReparentBackgroundWidgets(int src_container,
// can temporarily be two desktop background widgets. We must reparent
// both of them - one above and one here.
DesktopBackgroundWidgetController* animating_controller =
- root_window_controller->animating_wallpaper_controller() ?
- root_window_controller->animating_wallpaper_controller()->
- GetController(false) :
- NULL;
+ root_window_controller->animating_wallpaper_controller()
+ ? root_window_controller->animating_wallpaper_controller()
+ ->GetController(false)
+ : NULL;
if (animating_controller) {
moved |= animating_controller->Reparent(
- root_window_controller->GetRootWindow(),
- src_container,
+ root_window_controller->GetRootWindow(), src_container,
dst_container);
}
}
« no previous file with comments | « ash/default_user_wallpaper_delegate.cc ('k') | ash/desktop_background/desktop_background_controller_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698