| OLD | NEW |
|---|
| 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/chromeos/rotation/tray_rotation_lock.h" | 5 #include "ash/system/rotation/tray_rotation_lock.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/actionable_view.h" | |
| 8 #include "ash/common/system/tray/system_tray.h" | |
| 9 #include "ash/common/system/tray/tray_constants.h" | |
| 10 #include "ash/common/system/tray/tray_popup_item_style.h" | |
| 11 #include "ash/common/system/tray/tray_popup_utils.h" | |
| 12 #include "ash/common/system/tray/tri_view.h" | |
| 13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 7 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 14 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
| 15 #include "ash/display/screen_orientation_controller_chromeos.h" | 9 #include "ash/display/screen_orientation_controller_chromeos.h" |
| 16 #include "ash/resources/vector_icons/vector_icons.h" | 10 #include "ash/resources/vector_icons/vector_icons.h" |
| 17 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 18 #include "ash/strings/grit/ash_strings.h" | 12 #include "ash/strings/grit/ash_strings.h" |
| 13 #include "ash/system/tray/actionable_view.h" |
| 14 #include "ash/system/tray/system_tray.h" |
| 15 #include "ash/system/tray/tray_constants.h" |
| 16 #include "ash/system/tray/tray_popup_item_style.h" |
| 17 #include "ash/system/tray/tray_popup_utils.h" |
| 18 #include "ash/system/tray/tri_view.h" |
| 19 #include "ui/accessibility/ax_node_data.h" | 19 #include "ui/accessibility/ax_node_data.h" |
| 20 #include "ui/base/l10n/l10n_util.h" | 20 #include "ui/base/l10n/l10n_util.h" |
| 21 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
| 22 #include "ui/gfx/paint_vector_icon.h" | 22 #include "ui/gfx/paint_vector_icon.h" |
| 23 #include "ui/views/controls/image_view.h" | 23 #include "ui/views/controls/image_view.h" |
| 24 #include "ui/views/controls/label.h" | 24 #include "ui/views/controls/label.h" |
| 25 #include "ui/views/layout/fill_layout.h" | 25 #include "ui/views/layout/fill_layout.h" |
| 26 | 26 |
| 27 namespace ash { | 27 namespace ash { |
| 28 | 28 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 } | 210 } |
| 211 | 211 |
| 212 void TrayRotationLock::StopObservingRotation() { | 212 void TrayRotationLock::StopObservingRotation() { |
| 213 ScreenOrientationController* controller = | 213 ScreenOrientationController* controller = |
| 214 Shell::GetInstance()->screen_orientation_controller(); | 214 Shell::GetInstance()->screen_orientation_controller(); |
| 215 if (controller) | 215 if (controller) |
| 216 controller->RemoveObserver(this); | 216 controller->RemoveObserver(this); |
| 217 } | 217 } |
| 218 | 218 |
| 219 } // namespace ash | 219 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2732813002:
chromeos: Move files in //ash/common to //ash, part 1 (Closed)
