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

Side by Side Diff: ash/system/user/user_card_view.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 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/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
14 #include "ash/system/tray/tray_constants.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"
(...skipping 11 matching lines...) Expand all
32 #include "ui/gfx/render_text.h" 32 #include "ui/gfx/render_text.h"
33 #include "ui/gfx/text_elider.h" 33 #include "ui/gfx/text_elider.h"
34 #include "ui/gfx/text_utils.h" 34 #include "ui/gfx/text_utils.h"
35 #include "ui/views/border.h" 35 #include "ui/views/border.h"
36 #include "ui/views/controls/link.h" 36 #include "ui/views/controls/link.h"
37 #include "ui/views/controls/link_listener.h" 37 #include "ui/views/controls/link_listener.h"
38 #include "ui/views/layout/box_layout.h" 38 #include "ui/views/layout/box_layout.h"
39 39
40 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
41 #include "ash/ash_view_ids.h" 41 #include "ash/ash_view_ids.h"
42 #include "ash/media_delegate.h" 42 #include "ash/common/media_delegate.h"
43 #include "ash/system/tray/media_security/media_capture_observer.h" 43 #include "ash/system/tray/media_security/media_capture_observer.h"
44 #include "ui/views/controls/image_view.h" 44 #include "ui/views/controls/image_view.h"
45 #include "ui/views/layout/fill_layout.h" 45 #include "ui/views/layout/fill_layout.h"
46 #endif 46 #endif
47 47
48 namespace ash { 48 namespace ash {
49 namespace tray { 49 namespace tray {
50 50
51 namespace { 51 namespace {
52 52
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 SessionStateDelegate* delegate = 454 SessionStateDelegate* delegate =
455 Shell::GetInstance()->session_state_delegate(); 455 Shell::GetInstance()->session_state_delegate();
456 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(), 456 icon->SetImage(delegate->GetUserInfo(user_index)->GetImage(),
457 gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); 457 gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
458 } 458 }
459 return icon; 459 return icon;
460 } 460 }
461 461
462 } // namespace tray 462 } // namespace tray
463 } // namespace ash 463 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698