ash/common/system/user/user_view.cc - Issue 2686703002: Remove TrayPopupLabelButton (a pre-MD class) and its assets.

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

Issue 2686703002: Remove TrayPopupLabelButton (a pre-MD class) and its assets. (Closed)

Patch Set: nit Created 3 years, 10 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:

« no previous file with comments | « ash/common/system/tray_accessibility.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

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/material_design/material_design_controller.h"	10 #include "ash/common/material_design/material_design_controller.h"

11 #include "ash/common/multi_profile_uma.h"	11 #include "ash/common/multi_profile_uma.h"

12 #include "ash/common/popup_message.h"	12 #include "ash/common/popup_message.h"

13 #include "ash/common/session/session_state_delegate.h"	13 #include "ash/common/session/session_state_delegate.h"

14 #include "ash/common/shell_delegate.h"	14 #include "ash/common/shell_delegate.h"

15 #include "ash/common/system/tray/system_tray.h"	15 #include "ash/common/system/tray/system_tray.h"

16 #include "ash/common/system/tray/system_tray_controller.h"	16 #include "ash/common/system/tray/system_tray_controller.h"

17 #include "ash/common/system/tray/system_tray_delegate.h"	17 #include "ash/common/system/tray/system_tray_delegate.h"

18 #include "ash/common/system/tray/tray_constants.h"	18 #include "ash/common/system/tray/tray_constants.h"

19 #include "ash/common/system/tray/tray_popup_item_style.h"	19 #include "ash/common/system/tray/tray_popup_item_style.h"

20 #include "ash/common/system/tray/tray_popup_label_button.h"

21 #include "ash/common/system/tray/tray_popup_label_button_border.h"

22 #include "ash/common/system/tray/tray_popup_utils.h"	20 #include "ash/common/system/tray/tray_popup_utils.h"

23 #include "ash/common/system/user/button_from_view.h"	21 #include "ash/common/system/user/button_from_view.h"

24 #include "ash/common/system/user/login_status.h"	22 #include "ash/common/system/user/login_status.h"

25 #include "ash/common/system/user/rounded_image_view.h"	23 #include "ash/common/system/user/rounded_image_view.h"

26 #include "ash/common/system/user/user_card_view.h"	24 #include "ash/common/system/user/user_card_view.h"

27 #include "ash/common/wm_lookup.h"	25 #include "ash/common/wm_lookup.h"

28 #include "ash/common/wm_shell.h"	26 #include "ash/common/wm_shell.h"

29 #include "ash/common/wm_window.h"	27 #include "ash/common/wm_window.h"

30 #include "ash/public/cpp/shell_window_ids.h"	28 #include "ash/public/cpp/shell_window_ids.h"

31 #include "ash/resources/vector_icons/vector_icons.h"	29 #include "ash/resources/vector_icons/vector_icons.h"

(...skipping 665 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
697 focus_manager_ = nullptr;	695 focus_manager_ = nullptr;

698 if (user_card_view_->GetFocusManager())	696 if (user_card_view_->GetFocusManager())

699 user_card_view_->GetFocusManager()->ClearFocus();	697 user_card_view_->GetFocusManager()->ClearFocus();

700 popup_message_.reset();	698 popup_message_.reset();

701 mouse_watcher_.reset();	699 mouse_watcher_.reset();

702 add_menu_option_.reset();	700 add_menu_option_.reset();

703 }	701 }

704	702

705 } // namespace tray	703 } // namespace tray

706 } // namespace ash	704 } // namespace ash

OLD	NEW