Switch primary display

ash/system/tray_display.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
@@ skipping 60 matching lines @@
         }
         return;
       }
       case chromeos::STATE_DUAL_PRIMARY_ONLY:
       case chromeos::STATE_DUAL_SECONDARY_ONLY: {
         aura::DisplayManager* display_manager =
             aura::Env::GetInstance()->display_manager();
         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);
         }
         return;
       }
       default:
         NOTREACHED();
     }
 #endif  // OS_CHROMEOS
@@ skipping 61 matching lines @@
 #if defined(OS_CHROMEOS)
 void TrayDisplay::OnDisplayModeChanged() {
   if (default_)
     default_->Update();
 }
 #endif
 
 
 }  // namespace internal
 }  // namespace ash