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

Unified Diff: ash/system/tray_display.cc

Issue 10905288: Switch primary display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_display.cc
diff --git a/ash/system/tray_display.cc b/ash/system/tray_display.cc
index 1e390fcc874ad361c5112b922571b2b080b2a308..66c99526b59cb10a732211a1a2a3c27ee25b2b92 100644
--- a/ash/system/tray_display.cc
+++ b/ash/system/tray_display.cc
@@ -5,6 +5,7 @@
#include "ash/system/tray_display.h"
#include "ash/display/display_controller.h"
+#include "ash/screen_ash.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -85,7 +86,8 @@ class DisplayView : public ash::internal::ActionableView {
if (display_manager->GetNumDisplays() > 1) {
label_->SetText(l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
- UTF8ToUTF16(display_manager->GetDisplayNameAt(1))));
+ UTF8ToUTF16(display_manager->GetDisplayNameFor(
+ ScreenAsh::GetSecondaryDisplay()))));
SetVisible(true);
} else {
SetVisible(false);
« no previous file with comments | « ash/shell.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698