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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
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/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/shelf/wm_shelf_util.h" 9 #include "ash/common/shelf/wm_shelf_util.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"
11 #include "ash/shelf/shelf_util.h" 11 #include "ash/shelf/shelf_util.h"
12 #include "ash/shell_delegate.h" 12 #include "ash/shell.h"
13 #include "ash/system/tray/system_tray.h" 13 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/system_tray_delegate.h" 14 #include "ash/system/tray/system_tray_delegate.h"
15 #include "ash/system/tray/system_tray_notifier.h" 15 #include "ash/system/tray/system_tray_notifier.h"
16 #include "ash/system/tray/tray_constants.h" 16 #include "ash/system/tray/tray_constants.h"
17 #include "ash/system/tray/tray_item_view.h" 17 #include "ash/system/tray/tray_item_view.h"
18 #include "ash/system/tray/tray_utils.h" 18 #include "ash/system/tray/tray_utils.h"
19 #include "ash/system/user/rounded_image_view.h" 19 #include "ash/system/user/rounded_image_view.h"
20 #include "ash/system/user/user_view.h" 20 #include "ash/system/user/user_view.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/strings/string16.h" 22 #include "base/strings/string16.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 // Unit tests might come here with no images for some users. 268 // Unit tests might come here with no images for some users.
269 if (avatar_->size().IsEmpty()) 269 if (avatar_->size().IsEmpty())
270 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 270 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
271 } 271 }
272 272
273 void TrayUser::UpdateLayoutOfItem() { 273 void TrayUser::UpdateLayoutOfItem() {
274 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); 274 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
275 } 275 }
276 276
277 } // namespace ash 277 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698