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

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

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/user/user_card_view.cc ('k') | ash/test/test_session_state_delegate.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_view.h" 5 #include "ash/system/user/user_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/multi_profile_uma.h" 9 #include "ash/multi_profile_uma.h"
10 #include "ash/popup_message.h" 10 #include "ash/popup_message.h"
11 #include "ash/session/session_state_delegate.h" 11 #include "ash/session/session_state_delegate.h"
12 #include "ash/session/user_info.h"
13 #include "ash/shell.h" 12 #include "ash/shell.h"
14 #include "ash/shell_delegate.h" 13 #include "ash/shell_delegate.h"
15 #include "ash/system/tray/system_tray.h" 14 #include "ash/system/tray/system_tray.h"
16 #include "ash/system/tray/system_tray_delegate.h" 15 #include "ash/system/tray/system_tray_delegate.h"
17 #include "ash/system/tray/tray_popup_label_button.h" 16 #include "ash/system/tray/tray_popup_label_button.h"
18 #include "ash/system/tray/tray_popup_label_button_border.h" 17 #include "ash/system/tray/tray_popup_label_button_border.h"
19 #include "ash/system/user/button_from_view.h" 18 #include "ash/system/user/button_from_view.h"
20 #include "ash/system/user/config.h" 19 #include "ash/system/user/config.h"
21 #include "ash/system/user/rounded_image_view.h" 20 #include "ash/system/user/rounded_image_view.h"
22 #include "ash/system/user/user_card_view.h" 21 #include "ash/system/user/user_card_view.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"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/views/layout/fill_layout.h" 27 #include "ui/views/layout/fill_layout.h"
28 #include "ui/views/painter.h" 28 #include "ui/views/painter.h"
29 #include "ui/wm/core/shadow_types.h" 29 #include "ui/wm/core/shadow_types.h"
30 30
31 namespace ash { 31 namespace ash {
32 namespace tray { 32 namespace tray {
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 focus_manager_ = NULL; 544 focus_manager_ = NULL;
545 if (user_card_view_->GetFocusManager()) 545 if (user_card_view_->GetFocusManager())
546 user_card_view_->GetFocusManager()->ClearFocus(); 546 user_card_view_->GetFocusManager()->ClearFocus();
547 popup_message_.reset(); 547 popup_message_.reset();
548 mouse_watcher_.reset(); 548 mouse_watcher_.reset();
549 add_menu_option_.reset(); 549 add_menu_option_.reset();
550 } 550 }
551 551
552 } // namespace tray 552 } // namespace tray
553 } // namespace ash 553 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/user_card_view.cc ('k') | ash/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698