Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: ash/system/chromeos/tray_display.cc

Issue 1138253003: Notificaiton Message for Unified mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <vector> 7 #include <vector>
8 8
9 #include "ash/content/display/screen_orientation_controller_chromeos.h" 9 #include "ash/content/display/screen_orientation_controller_chromeos.h"
10 #include "ash/display/display_controller.h" 10 #include "ash/display/display_controller.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 if (display_manager->IsInMirrorMode()) { 239 if (display_manager->IsInMirrorMode()) {
240 if (gfx::Display::HasInternalDisplay()) { 240 if (gfx::Display::HasInternalDisplay()) {
241 return l10n_util::GetStringFUTF16( 241 return l10n_util::GetStringFUTF16(
242 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING, 242 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING,
243 GetDisplayName(display_manager->mirroring_display_id())); 243 GetDisplayName(display_manager->mirroring_display_id()));
244 } 244 }
245 return l10n_util::GetStringUTF16( 245 return l10n_util::GetStringUTF16(
246 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL); 246 IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL);
247 } 247 }
248 248
249 if (display_manager->IsInUnifiedMode())
250 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED);
251
249 int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id(); 252 int64 primary_id = Shell::GetScreen()->GetPrimaryDisplay().id();
250 if (gfx::Display::HasInternalDisplay() && 253 if (gfx::Display::HasInternalDisplay() &&
251 !(gfx::Display::InternalDisplayId() == primary_id)) { 254 !(gfx::Display::InternalDisplayId() == primary_id)) {
252 if (additional_message_out) { 255 if (additional_message_out) {
253 *additional_message_out = l10n_util::GetStringUTF16( 256 *additional_message_out = l10n_util::GetStringUTF16(
254 IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION); 257 IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION);
255 } 258 }
256 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED); 259 return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
257 } 260 }
258 261
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { 445 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
443 views::View* view = default_; 446 views::View* view = default_;
444 if (view) { 447 if (view) {
445 view->GetAccessibleState(state); 448 view->GetAccessibleState(state);
446 return true; 449 return true;
447 } 450 }
448 return false; 451 return false;
449 } 452 }
450 453
451 } // namespace ash 454 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698