Rename gfx::Monitor to gfx::Display

chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.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 "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 36 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/time_format.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 static const char kOtherNetworksFakePath[] = "?";
 
 // Keys for the network description dictionary passed to the web ui. Make sure
 // to keep the strings in sync with what the Javascript side uses.
 const char kNetworkInfoKeyActivationState[] = "activation_state";
@@ skipping 1061 matching lines @@
   return browser->window()->GetNativeWindow();
 }
 
 Browser* InternetOptionsHandler::GetAppropriateBrowser() {
   return browser::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord());
 }
 
 float InternetOptionsHandler::GetIconScaleFactor() {
   gfx::NativeWindow window = GetNativeWindow();
-  gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(window);
-  return monitor.device_scale_factor();
+  gfx::Display display = gfx::Screen::GetMonitorNearestWindow(window);
+  return display.device_scale_factor();
 }
 
 void InternetOptionsHandler::NetworkCommandCallback(const ListValue* args) {
   std::string str_type;
   std::string service_path;
   std::string command;
   if (args->GetSize() != 3 ||
       !args->GetString(0, &str_type) ||
       !args->GetString(1, &service_path) ||
       !args->GetString(2, &command)) {
@@ skipping 320 matching lines @@
   if (default_value)
     value_dict->Set("default", default_value->DeepCopy());
   if (ui_data.managed())
     value_dict->SetString("controlledBy", "policy");
   else if (ui_data.recommended())
     value_dict->SetString("controlledBy", "recommended");
   settings->Set(key, value_dict);
 }
 
 }  // namespace options2