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/chromeos/tray_display.h" | 5 #include "ash/system/chromeos/tray_display.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, | 243 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, |
244 GetDisplayName(display_manager->mirroring_display_id())); | 244 GetDisplayName(display_manager->mirroring_display_id())); |
245 } | 245 } |
246 return l10n_util::GetStringUTF16( | 246 return l10n_util::GetStringUTF16( |
247 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL); | 247 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL); |
248 } | 248 } |
249 | 249 |
250 if (display_manager->IsInUnifiedMode()) | 250 if (display_manager->IsInUnifiedMode()) |
251 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED); | 251 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED); |
252 | 252 |
253 int64_t primary_id = Shell::GetScreen()->GetPrimaryDisplay().id(); | 253 int64_t primary_id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id(); |
254 if (gfx::Display::HasInternalDisplay() && | 254 if (gfx::Display::HasInternalDisplay() && |
255 !(gfx::Display::IsInternalDisplayId(primary_id))) { | 255 !(gfx::Display::IsInternalDisplayId(primary_id))) { |
256 if (additional_message_out) { | 256 if (additional_message_out) { |
257 *additional_message_out = ash::SubstituteChromeOSDeviceType( | 257 *additional_message_out = ash::SubstituteChromeOSDeviceType( |
258 IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION); | 258 IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION); |
259 } | 259 } |
260 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED); | 260 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED); |
261 } | 261 } |
262 | 262 |
263 return base::string16(); | 263 return base::string16(); |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { | 444 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { |
445 views::View* view = default_; | 445 views::View* view = default_; |
446 if (view) { | 446 if (view) { |
447 view->GetAccessibleState(state); | 447 view->GetAccessibleState(state); |
448 return true; | 448 return true; |
449 } | 449 } |
450 return false; | 450 return false; |
451 } | 451 } |
452 | 452 |
453 } // namespace ash | 453 } // namespace ash |
OLD | NEW |