OLD | NEW |
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/common/system/user/user_view.h" | 5 #include "ash/common/system/user/user_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/multi_profile_uma.h" | 10 #include "ash/common/multi_profile_uma.h" |
11 #include "ash/common/popup_message.h" | 11 #include "ash/common/popup_message.h" |
12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
13 #include "ash/common/shell_delegate.h" | 13 #include "ash/common/shell_delegate.h" |
14 #include "ash/common/shell_window_ids.h" | |
15 #include "ash/common/system/tray/system_tray.h" | 14 #include "ash/common/system/tray/system_tray.h" |
16 #include "ash/common/system/tray/system_tray_delegate.h" | 15 #include "ash/common/system/tray/system_tray_delegate.h" |
17 #include "ash/common/system/tray/tray_constants.h" | 16 #include "ash/common/system/tray/tray_constants.h" |
18 #include "ash/common/system/tray/tray_popup_label_button.h" | 17 #include "ash/common/system/tray/tray_popup_label_button.h" |
19 #include "ash/common/system/tray/tray_popup_label_button_border.h" | 18 #include "ash/common/system/tray/tray_popup_label_button_border.h" |
20 #include "ash/common/system/user/button_from_view.h" | 19 #include "ash/common/system/user/button_from_view.h" |
21 #include "ash/common/system/user/login_status.h" | 20 #include "ash/common/system/user/login_status.h" |
22 #include "ash/common/system/user/rounded_image_view.h" | 21 #include "ash/common/system/user/rounded_image_view.h" |
23 #include "ash/common/system/user/user_card_view.h" | 22 #include "ash/common/system/user/user_card_view.h" |
24 #include "ash/common/wm_lookup.h" | 23 #include "ash/common/wm_lookup.h" |
25 #include "ash/common/wm_root_window_controller.h" | 24 #include "ash/common/wm_root_window_controller.h" |
26 #include "ash/common/wm_shell.h" | 25 #include "ash/common/wm_shell.h" |
27 #include "ash/common/wm_window.h" | 26 #include "ash/common/wm_window.h" |
| 27 #include "ash/public/cpp/shell_window_ids.h" |
28 #include "components/signin/core/account_id/account_id.h" | 28 #include "components/signin/core/account_id/account_id.h" |
29 #include "components/user_manager/user_info.h" | 29 #include "components/user_manager/user_info.h" |
30 #include "grit/ash_resources.h" | 30 #include "grit/ash_resources.h" |
31 #include "grit/ash_strings.h" | 31 #include "grit/ash_strings.h" |
32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
33 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
34 #include "ui/views/layout/fill_layout.h" | 34 #include "ui/views/layout/fill_layout.h" |
35 #include "ui/views/painter.h" | 35 #include "ui/views/painter.h" |
36 | 36 |
37 namespace ash { | 37 namespace ash { |
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 focus_manager_ = NULL; | 513 focus_manager_ = NULL; |
514 if (user_card_view_->GetFocusManager()) | 514 if (user_card_view_->GetFocusManager()) |
515 user_card_view_->GetFocusManager()->ClearFocus(); | 515 user_card_view_->GetFocusManager()->ClearFocus(); |
516 popup_message_.reset(); | 516 popup_message_.reset(); |
517 mouse_watcher_.reset(); | 517 mouse_watcher_.reset(); |
518 add_menu_option_.reset(); | 518 add_menu_option_.reset(); |
519 } | 519 } |
520 | 520 |
521 } // namespace tray | 521 } // namespace tray |
522 } // namespace ash | 522 } // namespace ash |
OLD | NEW |