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/display/display_util.h" | 5 #include "ash/display/display_util.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/new_window_controller.h" | |
11 #include "ash/common/wm_shell.h" | |
12 #include "ash/display/extended_mouse_warp_controller.h" | 10 #include "ash/display/extended_mouse_warp_controller.h" |
13 #include "ash/display/null_mouse_warp_controller.h" | 11 #include "ash/display/null_mouse_warp_controller.h" |
14 #include "ash/display/unified_mouse_warp_controller.h" | 12 #include "ash/display/unified_mouse_warp_controller.h" |
15 #include "ash/host/ash_window_tree_host.h" | 13 #include "ash/host/ash_window_tree_host.h" |
| 14 #include "ash/new_window_controller.h" |
16 #include "ash/resources/vector_icons/vector_icons.h" | 15 #include "ash/resources/vector_icons/vector_icons.h" |
17 #include "ash/shell.h" | 16 #include "ash/shell.h" |
18 #include "ash/strings/grit/ash_strings.h" | 17 #include "ash/strings/grit/ash_strings.h" |
19 #include "ash/system/system_notifier.h" | 18 #include "ash/system/system_notifier.h" |
| 19 #include "ash/wm_shell.h" |
20 #include "base/memory/ptr_util.h" | 20 #include "base/memory/ptr_util.h" |
21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
22 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
23 #include "base/sys_info.h" | 23 #include "base/sys_info.h" |
24 #include "ui/aura/env.h" | 24 #include "ui/aura/env.h" |
25 #include "ui/aura/window_tree_host.h" | 25 #include "ui/aura/window_tree_host.h" |
26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
27 #include "ui/display/display.h" | 27 #include "ui/display/display.h" |
28 #include "ui/display/manager/display_manager.h" | 28 #include "ui/display/manager/display_manager.h" |
29 #include "ui/display/manager/managed_display_info.h" | 29 #include "ui/display/manager/managed_display_info.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 message_center::NotificationList::Notifications notifications = | 202 message_center::NotificationList::Notifications notifications = |
203 message_center::MessageCenter::Get()->GetVisibleNotifications(); | 203 message_center::MessageCenter::Get()->GetVisibleNotifications(); |
204 for (auto* const notification : notifications) { | 204 for (auto* const notification : notifications) { |
205 if (notification->id() == kDisplayErrorNotificationId) | 205 if (notification->id() == kDisplayErrorNotificationId) |
206 return notification->message(); | 206 return notification->message(); |
207 } | 207 } |
208 return base::string16(); | 208 return base::string16(); |
209 } | 209 } |
210 | 210 |
211 } // namespace ash | 211 } // namespace ash |
OLD | NEW |