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

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 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
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/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" 14 #include "ash/common/shell_window_ids.h"
15 #include "ash/common/system/tray/system_tray.h"
15 #include "ash/common/system/tray/system_tray_delegate.h" 16 #include "ash/common/system/tray/system_tray_delegate.h"
16 #include "ash/common/system/tray/tray_constants.h" 17 #include "ash/common/system/tray/tray_constants.h"
17 #include "ash/common/system/tray/tray_popup_label_button.h" 18 #include "ash/common/system/tray/tray_popup_label_button.h"
18 #include "ash/common/system/tray/tray_popup_label_button_border.h" 19 #include "ash/common/system/tray/tray_popup_label_button_border.h"
19 #include "ash/common/system/user/button_from_view.h" 20 #include "ash/common/system/user/button_from_view.h"
20 #include "ash/common/system/user/login_status.h" 21 #include "ash/common/system/user/login_status.h"
21 #include "ash/common/system/user/rounded_image_view.h" 22 #include "ash/common/system/user/rounded_image_view.h"
22 #include "ash/common/system/user/user_card_view.h" 23 #include "ash/common/system/user/user_card_view.h"
23 #include "ash/common/wm_lookup.h" 24 #include "ash/common/wm_lookup.h"
24 #include "ash/common/wm_root_window_controller.h" 25 #include "ash/common/wm_root_window_controller.h"
25 #include "ash/common/wm_shell.h" 26 #include "ash/common/wm_shell.h"
26 #include "ash/common/wm_window.h" 27 #include "ash/common/wm_window.h"
27 #include "ash/system/tray/system_tray.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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 focus_manager_ = NULL; 512 focus_manager_ = NULL;
513 if (user_card_view_->GetFocusManager()) 513 if (user_card_view_->GetFocusManager())
514 user_card_view_->GetFocusManager()->ClearFocus(); 514 user_card_view_->GetFocusManager()->ClearFocus();
515 popup_message_.reset(); 515 popup_message_.reset();
516 mouse_watcher_.reset(); 516 mouse_watcher_.reset();
517 add_menu_option_.reset(); 517 add_menu_option_.reset();
518 } 518 }
519 519
520 } // namespace tray 520 } // namespace tray
521 } // namespace ash 521 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/user/tray_user_unittest.cc ('k') | ash/common/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698