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

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

Issue 2093283002: mash: Convert all of //ash/system to use WmShelf (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 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/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shelf/wm_shelf_util.h" 9 #include "ash/common/shelf/wm_shelf_util.h"
10 #include "ash/common/system/tray/system_tray_delegate.h" 10 #include "ash/common/system/tray/system_tray_delegate.h"
11 #include "ash/common/system/tray/tray_constants.h" 11 #include "ash/common/system/tray/tray_constants.h"
12 #include "ash/common/system/tray/tray_item_view.h" 12 #include "ash/common/system/tray/tray_item_view.h"
13 #include "ash/common/system/tray/tray_utils.h" 13 #include "ash/common/system/tray/tray_utils.h"
14 #include "ash/common/system/user/rounded_image_view.h" 14 #include "ash/common/system/user/rounded_image_view.h"
15 #include "ash/common/wm_shell.h" 15 #include "ash/common/wm_shell.h"
16 #include "ash/shelf/shelf_layout_manager.h"
17 #include "ash/shelf/shelf_util.h"
18 #include "ash/shell.h" 16 #include "ash/shell.h"
19 #include "ash/system/tray/system_tray.h" 17 #include "ash/system/tray/system_tray.h"
20 #include "ash/system/tray/system_tray_notifier.h" 18 #include "ash/system/tray/system_tray_notifier.h"
21 #include "ash/system/user/user_view.h" 19 #include "ash/system/user/user_view.h"
22 #include "base/logging.h" 20 #include "base/logging.h"
23 #include "base/strings/string16.h" 21 #include "base/strings/string16.h"
24 #include "components/signin/core/account_id/account_id.h" 22 #include "components/signin/core/account_id/account_id.h"
25 #include "components/user_manager/user_info.h" 23 #include "components/user_manager/user_info.h"
26 #include "grit/ash_strings.h" 24 #include "grit/ash_strings.h"
27 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // Unit tests might come here with no images for some users. 267 // Unit tests might come here with no images for some users.
270 if (avatar_->size().IsEmpty()) 268 if (avatar_->size().IsEmpty())
271 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 269 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
272 } 270 }
273 271
274 void TrayUser::UpdateLayoutOfItem() { 272 void TrayUser::UpdateLayoutOfItem() {
275 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); 273 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
276 } 274 }
277 275
278 } // namespace ash 276 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698