Allow switching between extended and unified

ash/system/chromeos/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/chromeos/tray_display.h"
 
 #include <vector>
 
 #include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_controller.h"
@@ skipping 74 matching lines @@
       IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
       GetDisplayName(display_id),
       display_data);
 }
 
 base::string16 GetAllDisplayInfo() {
   DisplayManager* display_manager = GetDisplayManager();
   std::vector<base::string16> lines;
   int64 internal_id = gfx::Display::kInvalidDisplayID;
   // Make sure to show the internal display first.
-  if (gfx::Display::HasInternalDisplay() &&
+  if (!display_manager->IsInUnifiedMode() &&
+      gfx::Display::HasInternalDisplay() &&
       gfx::Display::InternalDisplayId() ==
           display_manager->first_display_id()) {
     internal_id = display_manager->first_display_id();
     lines.push_back(GetDisplayInfoLine(internal_id));
   }
 
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     int64 id = display_manager->GetDisplayAt(i).id();
     if (id == internal_id)
       continue;
@@ skipping 339 matching lines @@
 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
   views::View* view = default_;
   if (view) {
     view->GetAccessibleState(state);
     return true;
   }
   return false;
 }
 
 }  // namespace ash