ASH: Use virtual screen coordinates in Display::bounds()

chrome/browser/ui/webui/options2/chromeos/display_options_handler.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/display_options_handler.h"
 
 #include <string>
 
 #include "ash/monitor/monitor_controller.h"
 #include "ash/shell.h"
@@ skipping 86 matching lines @@
 void DisplayOptionsHandler::SendDisplayInfo() {
   aura::MonitorManager* monitor_manager =
       aura::Env::GetInstance()->monitor_manager();
   chromeos::OutputConfigurator* output_configurator =
       ash::Shell::GetInstance()->output_configurator();
   base::FundamentalValue mirroring(
       output_configurator->output_state() == chromeos::STATE_DUAL_MIRROR);
 
   base::ListValue displays;
   for (size_t i = 0; i < monitor_manager->GetNumDisplays(); ++i) {
-    const gfx::Display& display = monitor_manager->GetDisplayAt(i);
-    const gfx::Rect& bounds = display.bounds();
+    const gfx::Display* display = monitor_manager->GetDisplayAt(i);

[Ben Goodger (Google), 2012/06/27 15:32:52]

i get confused by the various ways you return displays...

sometimes gfx::Display, sometimes const gfx::Display&, sometimes
gfx::Display*...

[oshima, 2012/06/27 21:00:06]

crbug.com/122863

I'm planning to consolidate gfx::Display and DisplaySettingsProvider (
crbug.com/122863), and most of them will be just "const gfx::Dislay*",
except for the case that display has to be modifiable.

+    const gfx::Rect& bounds = display->bounds();
     base::DictionaryValue* js_display = new base::DictionaryValue();
-    js_display->SetDouble("id", display.id());
+    js_display->SetDouble("id", display->id());
     js_display->SetDouble("x", bounds.x());
     js_display->SetDouble("y", bounds.y());
     js_display->SetDouble("width", bounds.width());
     js_display->SetDouble("height", bounds.height());
     displays.Set(i, js_display);
   }
 
   MonitorController* monitor_controller =
       ash::Shell::GetInstance()->monitor_controller();
   base::FundamentalValue layout(static_cast<int>(
@@ skipping 30 matching lines @@
   DCHECK_LE(MonitorController::TOP, layout);
   DCHECK_GE(MonitorController::LEFT, layout);
 
   ash::Shell::GetInstance()->monitor_controller()->SetSecondaryDisplayLayout(
       static_cast<MonitorController::SecondaryDisplayLayout>(layout));
   SendDisplayInfo();
 }
 
 }  // namespace options2
 }  // namespace chromeos