Move ash::DisplayInfo to ui

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 <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 52 matching lines @@
   if (mirroring)
     return base::string16();
 
   DCHECK(display->is_valid());
   return base::UTF8ToUTF16(display->size().ToString());
 }
 
 // Returns 1-line information for the specified display, like
 // "InternalDisplay: 1280x750"
 base::string16 GetDisplayInfoLine(int64_t display_id) {
-  const DisplayInfo& display_info =
+  const display::ManagedDisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display_id);
   if (GetDisplayManager()->mirroring_display_id() == display_id)
     return GetDisplayName(display_id);
 
   base::string16 size_text = GetDisplaySize(display_id);
   base::string16 display_data;
   if (display_info.has_overscan()) {
     display_data = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION, size_text,
         l10n_util::GetStringUTF16(
@@ skipping 131 matching lines @@
     }
 
     if (external_id == display::Display::kInvalidDisplayID) {
       return l10n_util::GetStringUTF16(
           IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
     }
 
     // The external display name may have an annotation of "(width x height)" in
     // case that the display is rotated or its resolution is changed.
     base::string16 name = GetDisplayName(external_id);
-    const DisplayInfo& display_info =
+    const display::ManagedDisplayInfo& display_info =
         display_manager->GetDisplayInfo(external_id);
     if (display_info.GetActiveRotation() != display::Display::ROTATE_0 ||
         display_info.configured_ui_scale() != 1.0f ||
         !display_info.overscan_insets_in_dip().IsEmpty()) {
       name =
           l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
                                      name, GetDisplaySize(external_id));
     } else if (display_info.overscan_insets_in_dip().IsEmpty() &&
                display_info.has_overscan()) {
       name = l10n_util::GetStringFUTF16(
@@ skipping 40 matching lines @@
       return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
     }
 
     return base::string16();
   }
 
  private:
   bool ShouldShowFirstDisplayInfo() const {
     const int64_t first_display_id = GetDisplayManager()->first_display_id();
 
-    const DisplayInfo& display_info =
+    const display::ManagedDisplayInfo& display_info =
         GetDisplayManager()->GetDisplayInfo(first_display_id);
     return (display_info.GetActiveRotation() != display::Display::ROTATE_0 &&
             (display_info.active_rotation_source() !=
                  display::Display::ROTATION_SOURCE_ACCELEROMETER ||
              !display::Display::IsInternalDisplayId(first_display_id))) ||
            display_info.configured_ui_scale() != 1.0f ||
            !display_info.overscan_insets_in_dip().IsEmpty() ||
            display_info.has_overscan();
   }
 
@@ skipping 176 matching lines @@
 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
   views::View* view = default_;
   if (view) {
     view->GetAccessibleState(state);
     return true;
   }
   return false;
 }
 
 }  // namespace ash