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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/system/user/user_view.h ('k') | ash/system/virtual_keyboard/virtual_keyboard_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/session/session_state_delegate.h" 11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/shell_delegate.h" 12 #include "ash/common/shell_delegate.h"
13 #include "ash/common/system/tray/system_tray.h"
14 #include "ash/common/system/tray/system_tray_controller.h"
15 #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_popup_item_style.h"
18 #include "ash/common/system/tray/tray_popup_utils.h"
19 #include "ash/common/system/user/button_from_view.h"
20 #include "ash/common/system/user/login_status.h"
21 #include "ash/common/system/user/rounded_image_view.h"
22 #include "ash/common/system/user/user_card_view.h"
23 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
24 #include "ash/common/wm_window.h" 14 #include "ash/common/wm_window.h"
25 #include "ash/public/cpp/shell_window_ids.h" 15 #include "ash/public/cpp/shell_window_ids.h"
26 #include "ash/resources/grit/ash_resources.h" 16 #include "ash/resources/grit/ash_resources.h"
27 #include "ash/resources/vector_icons/vector_icons.h" 17 #include "ash/resources/vector_icons/vector_icons.h"
28 #include "ash/root_window_controller.h" 18 #include "ash/root_window_controller.h"
29 #include "ash/strings/grit/ash_strings.h" 19 #include "ash/strings/grit/ash_strings.h"
20 #include "ash/system/tray/system_tray.h"
21 #include "ash/system/tray/system_tray_controller.h"
22 #include "ash/system/tray/system_tray_delegate.h"
23 #include "ash/system/tray/tray_constants.h"
24 #include "ash/system/tray/tray_popup_item_style.h"
25 #include "ash/system/tray/tray_popup_utils.h"
26 #include "ash/system/user/button_from_view.h"
27 #include "ash/system/user/login_status.h"
28 #include "ash/system/user/rounded_image_view.h"
29 #include "ash/system/user/user_card_view.h"
30 #include "base/memory/ptr_util.h" 30 #include "base/memory/ptr_util.h"
31 #include "components/signin/core/account_id/account_id.h" 31 #include "components/signin/core/account_id/account_id.h"
32 #include "components/user_manager/user_info.h" 32 #include "components/user_manager/user_info.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/resource/resource_bundle.h" 34 #include "ui/base/resource/resource_bundle.h"
35 #include "ui/gfx/canvas.h" 35 #include "ui/gfx/canvas.h"
36 #include "ui/gfx/geometry/insets.h" 36 #include "ui/gfx/geometry/insets.h"
37 #include "ui/gfx/paint_vector_icon.h" 37 #include "ui/gfx/paint_vector_icon.h"
38 #include "ui/views/controls/button/label_button.h" 38 #include "ui/views/controls/button/label_button.h"
39 #include "ui/views/controls/label.h" 39 #include "ui/views/controls/label.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 return; 391 return;
392 focus_manager_->RemoveFocusChangeListener(this); 392 focus_manager_->RemoveFocusChangeListener(this);
393 focus_manager_ = nullptr; 393 focus_manager_ = nullptr;
394 if (user_card_view_->GetFocusManager()) 394 if (user_card_view_->GetFocusManager())
395 user_card_view_->GetFocusManager()->ClearFocus(); 395 user_card_view_->GetFocusManager()->ClearFocus();
396 add_menu_option_.reset(); 396 add_menu_option_.reset();
397 } 397 }
398 398
399 } // namespace tray 399 } // namespace tray
400 } // namespace ash 400 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/user_view.h ('k') | ash/system/virtual_keyboard/virtual_keyboard_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698