| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/tiles/tiles_default_view.h" | 5 #include "ash/system/tiles/tiles_default_view.h" |
| 6 | 6 |
| 7 #include "ash/common/metrics/user_metrics_action.h" | 7 #include "ash/metrics/user_metrics_action.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | |
| 9 #include "ash/common/shutdown_controller.h" | |
| 10 #include "ash/common/wm_shell.h" | |
| 11 #include "ash/resources/vector_icons/vector_icons.h" | 8 #include "ash/resources/vector_icons/vector_icons.h" |
| 9 #include "ash/session/session_state_delegate.h" |
| 12 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shutdown_controller.h" |
| 13 #include "ash/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
| 14 #include "ash/system/tray/system_menu_button.h" | 13 #include "ash/system/tray/system_menu_button.h" |
| 15 #include "ash/system/tray/system_tray.h" | 14 #include "ash/system/tray/system_tray.h" |
| 16 #include "ash/system/tray/system_tray_controller.h" | 15 #include "ash/system/tray/system_tray_controller.h" |
| 17 #include "ash/system/tray/system_tray_delegate.h" | 16 #include "ash/system/tray/system_tray_delegate.h" |
| 18 #include "ash/system/tray/system_tray_item.h" | 17 #include "ash/system/tray/system_tray_item.h" |
| 19 #include "ash/system/tray/tray_constants.h" | 18 #include "ash/system/tray/tray_constants.h" |
| 20 #include "ash/system/tray/tray_popup_utils.h" | 19 #include "ash/system/tray/tray_popup_utils.h" |
| 21 #include "ash/wm/lock_state_controller.h" | 20 #include "ash/wm/lock_state_controller.h" |
| 21 #include "ash/wm_shell.h" |
| 22 #include "chromeos/dbus/dbus_thread_manager.h" | 22 #include "chromeos/dbus/dbus_thread_manager.h" |
| 23 #include "chromeos/dbus/session_manager_client.h" | 23 #include "chromeos/dbus/session_manager_client.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/gfx/geometry/insets.h" | 25 #include "ui/gfx/geometry/insets.h" |
| 26 #include "ui/views/border.h" | 26 #include "ui/views/border.h" |
| 27 #include "ui/views/controls/button/custom_button.h" | 27 #include "ui/views/controls/button/custom_button.h" |
| 28 #include "ui/views/controls/separator.h" | 28 #include "ui/views/controls/separator.h" |
| 29 #include "ui/views/layout/box_layout.h" | 29 #include "ui/views/layout/box_layout.h" |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 views::View* TilesDefaultView::GetHelpButtonView() const { | 132 views::View* TilesDefaultView::GetHelpButtonView() const { |
| 133 return help_button_; | 133 return help_button_; |
| 134 } | 134 } |
| 135 | 135 |
| 136 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest() | 136 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest() |
| 137 const { | 137 const { |
| 138 return power_button_; | 138 return power_button_; |
| 139 } | 139 } |
| 140 | 140 |
| 141 } // namespace ash | 141 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
