ash/system/user/tray_user.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « ash/system/user/login_status.cc ('k') | ash/system/user/tray_user_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/session/session_state_delegate.h"	7 #include "ash/session/session_state_delegate.h"

8 #include "ash/common/shelf/wm_shelf_util.h"	8 #include "ash/shelf/wm_shelf_util.h"

9 #include "ash/common/wm_shell.h"

10 #include "ash/strings/grit/ash_strings.h"	9 #include "ash/strings/grit/ash_strings.h"

11 #include "ash/system/tray/system_tray.h"	10 #include "ash/system/tray/system_tray.h"

12 #include "ash/system/tray/system_tray_delegate.h"	11 #include "ash/system/tray/system_tray_delegate.h"

13 #include "ash/system/tray/system_tray_notifier.h"	12 #include "ash/system/tray/system_tray_notifier.h"

14 #include "ash/system/tray/tray_constants.h"	13 #include "ash/system/tray/tray_constants.h"

15 #include "ash/system/tray/tray_item_view.h"	14 #include "ash/system/tray/tray_item_view.h"

16 #include "ash/system/tray/tray_utils.h"	15 #include "ash/system/tray/tray_utils.h"

17 #include "ash/system/user/rounded_image_view.h"	16 #include "ash/system/user/rounded_image_view.h"

18 #include "ash/system/user/user_view.h"	17 #include "ash/system/user/user_view.h"

	18 #include "ash/wm_shell.h"

19 #include "base/logging.h"	19 #include "base/logging.h"

20 #include "base/strings/string16.h"	20 #include "base/strings/string16.h"

21 #include "components/signin/core/account_id/account_id.h"	21 #include "components/signin/core/account_id/account_id.h"

22 #include "components/user_manager/user_info.h"	22 #include "components/user_manager/user_info.h"

23 #include "ui/base/l10n/l10n_util.h"	23 #include "ui/base/l10n/l10n_util.h"

24 #include "ui/gfx/image/image.h"	24 #include "ui/gfx/image/image.h"

25 #include "ui/views/border.h"	25 #include "ui/views/border.h"

26 #include "ui/views/controls/label.h"	26 #include "ui/views/controls/label.h"

27 #include "ui/views/layout/box_layout.h"	27 #include "ui/views/layout/box_layout.h"

28 #include "ui/views/view.h"	28 #include "ui/views/view.h"

(...skipping 224 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
253 // Unit tests might come here with no images for some users.	253 // Unit tests might come here with no images for some users.

254 if (avatar_->size().IsEmpty())	254 if (avatar_->size().IsEmpty())

255 avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));	255 avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));

256 }	256 }

257	257

258 void TrayUser::UpdateLayoutOfItem() {	258 void TrayUser::UpdateLayoutOfItem() {

259 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());	259 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());

260 }	260 }

261	261

262 } // namespace ash	262 } // namespace ash

OLD	NEW