ash/system/user/tray_user.cc - Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS.

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 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix broken relative include. 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

« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/web_notification/web_notification_tray.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/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/wm_shell.h"	14 #include "ash/common/wm_shell.h"

15 #include "ash/shelf/shelf_layout_manager.h"	15 #include "ash/shelf/shelf_layout_manager.h"

16 #include "ash/shelf/shelf_util.h"	16 #include "ash/shelf/shelf_util.h"

17 #include "ash/shell.h"	17 #include "ash/shell.h"

(...skipping 251 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());	275 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());

276 }	276 }

277	277

278 } // namespace ash	278 } // namespace ash

OLD	NEW