Revert 182494

ui/gfx/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 "ui/gfx/display.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 14 matching lines @@
   double scale_in_double = 1.0;
   if (HasForceDeviceScaleFactorImpl()) {
     std::string value = CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kForceDeviceScaleFactor);
     if (!base::StringToDouble(value, &scale_in_double))
       LOG(ERROR) << "Failed to parse the default device scale factor:" << value;
   }
   return static_cast<float>(scale_in_double);
 }
 
-int64 internal_display_id_ = Display::kInvalidDisplayID;
-}  // namespace
+} // namespace
 
 const int64 Display::kInvalidDisplayID = -1;
 
 // static
 float Display::GetForcedDeviceScaleFactor() {
   static const float kForcedDeviceScaleFactor =
       GetForcedDeviceScaleFactorImpl();
   return kForcedDeviceScaleFactor;
 }
 
@@ skipping 76 matching lines @@
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
 }
 
 gfx::Size Display::GetSizeInPixel() const {
   return gfx::ToFlooredSize(gfx::ScaleSize(size(), device_scale_factor_));
 }
 
 std::string Display::ToString() const {
-  return base::StringPrintf(
-      "Display[%lld] bounds=%s, workarea=%s, scale=%f, %s",
-      static_cast<long long int>(id_),
-      bounds_.ToString().c_str(),
-      work_area_.ToString().c_str(),
-      device_scale_factor_,
-      IsInternal() ? "internal" : "external");
-}
-
-bool Display::IsInternal() const {
-  return is_valid() && (id_ == internal_display_id_);
-}
-
-int64 Display::InternalDisplayId() {
-  return internal_display_id_;
-}
-
-void Display::SetInternalDisplayId(int64 internal_display_id) {
-  internal_display_id_ = internal_display_id;
+  return base::StringPrintf("Display[%lld] bounds=%s, workarea=%s, scale=%f",
+                            static_cast<long long int>(id_),
+                            bounds_.ToString().c_str(),
+                            work_area_.ToString().c_str(),
+                            device_scale_factor_);
 }
 
 }  // namespace gfx