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

Side by Side Diff: ash/system/user/tray_user.cc

Issue 1645503004: [exp] ash: sysui for mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ash-in-mus
Patch Set: . Created 4 years, 10 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 #include "ash/system/user/tray_user.h" 5 #include "ash/system/user/tray_user.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 CHECK(user_info); 265 CHECK(user_info);
266 avatar_->SetImage(user_info->GetImage(), 266 avatar_->SetImage(user_info->GetImage(),
267 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 267 gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
268 268
269 // Unit tests might come here with no images for some users. 269 // Unit tests might come here with no images for some users.
270 if (avatar_->size().IsEmpty()) 270 if (avatar_->size().IsEmpty())
271 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 271 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
272 } 272 }
273 273
274 void TrayUser::UpdateLayoutOfItem() { 274 void TrayUser::UpdateLayoutOfItem() {
275 RootWindowController* controller = GetRootWindowController( 275 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
276 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
277 if (controller && controller->shelf()) {
278 UpdateAfterShelfAlignmentChange(
279 controller->GetShelfLayoutManager()->GetAlignment());
280 }
281 } 276 }
282 277
283 } // namespace ash 278 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698