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