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

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

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: Created 4 years, 6 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/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/shell_window_ids.h" 11 #include "ash/common/shell_window_ids.h"
11 #include "ash/common/wm_lookup.h" 12 #include "ash/common/wm_lookup.h"
12 #include "ash/common/wm_root_window_controller.h" 13 #include "ash/common/wm_root_window_controller.h"
13 #include "ash/common/wm_window.h" 14 #include "ash/common/wm_window.h"
14 #include "ash/multi_profile_uma.h" 15 #include "ash/multi_profile_uma.h"
15 #include "ash/popup_message.h" 16 #include "ash/popup_message.h"
16 #include "ash/session/session_state_delegate.h"
17 #include "ash/shell.h" 17 #include "ash/shell.h"
18 #include "ash/shell_delegate.h" 18 #include "ash/shell_delegate.h"
19 #include "ash/system/tray/system_tray.h" 19 #include "ash/system/tray/system_tray.h"
20 #include "ash/system/tray/system_tray_delegate.h" 20 #include "ash/system/tray/system_tray_delegate.h"
21 #include "ash/system/tray/tray_popup_label_button.h" 21 #include "ash/system/tray/tray_popup_label_button.h"
22 #include "ash/system/tray/tray_popup_label_button_border.h" 22 #include "ash/system/tray/tray_popup_label_button_border.h"
23 #include "ash/system/user/button_from_view.h" 23 #include "ash/system/user/button_from_view.h"
24 #include "ash/system/user/rounded_image_view.h" 24 #include "ash/system/user/rounded_image_view.h"
25 #include "ash/system/user/user_card_view.h" 25 #include "ash/system/user/user_card_view.h"
26 #include "components/signin/core/account_id/account_id.h" 26 #include "components/signin/core/account_id/account_id.h"
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 focus_manager_ = NULL; 525 focus_manager_ = NULL;
526 if (user_card_view_->GetFocusManager()) 526 if (user_card_view_->GetFocusManager())
527 user_card_view_->GetFocusManager()->ClearFocus(); 527 user_card_view_->GetFocusManager()->ClearFocus();
528 popup_message_.reset(); 528 popup_message_.reset();
529 mouse_watcher_.reset(); 529 mouse_watcher_.reset();
530 add_menu_option_.reset(); 530 add_menu_option_.reset();
531 } 531 }
532 532
533 } // namespace tray 533 } // namespace tray
534 } // namespace ash 534 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698