| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/session/session_state_delegate.h" | 9 #include "ash/session/session_state_delegate.h" |
| 10 #include "ash/session/user_info.h" | |
| 11 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| 12 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 13 #include "ash/system/tray/system_tray.h" | 12 #include "ash/system/tray/system_tray.h" |
| 14 #include "ash/system/tray/system_tray_notifier.h" | 13 #include "ash/system/tray/system_tray_notifier.h" |
| 15 #include "ash/system/tray/tray_constants.h" | 14 #include "ash/system/tray/tray_constants.h" |
| 16 #include "ash/system/tray/tray_item_view.h" | 15 #include "ash/system/tray/tray_item_view.h" |
| 17 #include "ash/system/tray/tray_utils.h" | 16 #include "ash/system/tray/tray_utils.h" |
| 18 #include "ash/system/user/accounts_detailed_view.h" | 17 #include "ash/system/user/accounts_detailed_view.h" |
| 19 #include "ash/system/user/rounded_image_view.h" | 18 #include "ash/system/user/rounded_image_view.h" |
| 20 #include "ash/system/user/user_view.h" | 19 #include "ash/system/user/user_view.h" |
| 21 #include "base/logging.h" | 20 #include "base/logging.h" |
| 22 #include "base/strings/string16.h" | 21 #include "base/strings/string16.h" |
| 22 #include "components/user_manager/user_info.h" |
| 23 #include "grit/ash_strings.h" | 23 #include "grit/ash_strings.h" |
| 24 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
| 25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| 26 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
| 27 #include "ui/views/border.h" | 27 #include "ui/views/border.h" |
| 28 #include "ui/views/controls/label.h" | 28 #include "ui/views/controls/label.h" |
| 29 #include "ui/views/layout/box_layout.h" | 29 #include "ui/views/layout/box_layout.h" |
| 30 #include "ui/views/view.h" | 30 #include "ui/views/view.h" |
| 31 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
| 32 | 32 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 void TrayUser::UpdateLayoutOfItem() { | 286 void TrayUser::UpdateLayoutOfItem() { |
| 287 RootWindowController* controller = GetRootWindowController( | 287 RootWindowController* controller = GetRootWindowController( |
| 288 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); | 288 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); |
| 289 if (controller && controller->shelf()) { | 289 if (controller && controller->shelf()) { |
| 290 UpdateAfterShelfAlignmentChange( | 290 UpdateAfterShelfAlignmentChange( |
| 291 controller->GetShelfLayoutManager()->GetAlignment()); | 291 controller->GetShelfLayoutManager()->GetAlignment()); |
| 292 } | 292 } |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace ash | 295 } // namespace ash |
| OLD | NEW |