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

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

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (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
« no previous file with comments | « ash/system/user/tray_user_unittest.cc ('k') | ash/system/user/user_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/user_card_view.h" 5 #include "ash/system/user/user_card_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/system/tray/system_tray_delegate.h" 11 #include "ash/common/system/tray/system_tray_delegate.h"
12 #include "ash/common/system/tray/tray_constants.h"
12 #include "ash/shell.h" 13 #include "ash/shell.h"
13 #include "ash/system/tray/system_tray_notifier.h" 14 #include "ash/system/tray/system_tray_notifier.h"
14 #include "ash/system/tray/tray_constants.h"
15 #include "ash/system/tray/tray_utils.h" 15 #include "ash/system/tray/tray_utils.h"
16 #include "ash/system/user/rounded_image_view.h" 16 #include "ash/system/user/rounded_image_view.h"
17 #include "base/i18n/rtl.h" 17 #include "base/i18n/rtl.h"
18 #include "base/memory/scoped_vector.h" 18 #include "base/memory/scoped_vector.h"
19 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "components/user_manager/user_info.h" 22 #include "components/user_manager/user_info.h"
23 #include "grit/ash_resources.h" 23 #include "grit/ash_resources.h"
24 #include "grit/ash_strings.h" 24 #include "grit/ash_strings.h"
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 SessionStateDelegate* delegate = 453 SessionStateDelegate* delegate =
454 Shell::GetInstance()->session_state_delegate(); 454 Shell::GetInstance()->session_state_delegate();
455 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(), 455 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
456 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 456 gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
457 } 457 }
458 return icon; 458 return icon;
459 } 459 }
460 460
461 } // namespace tray 461 } // namespace tray
462 } // namespace ash 462 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/tray_user_unittest.cc ('k') | ash/system/user/user_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698