Add context to gfx::Screen calls in support of simultaneous desktop+ash

chrome/browser/ui/panels/display_settings_provider.cc

Index: chrome/browser/ui/panels/display_settings_provider.cc
diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc
index d27ed9d196e65e8d2f239b723c3ca88bdc832513..13a3ce5345954aa7c373770e7b835de559eac477 100644
--- a/chrome/browser/ui/panels/display_settings_provider.cc
+++ b/chrome/browser/ui/panels/display_settings_provider.cc
@@ -69,7 +69,8 @@ gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
 }
 
 gfx::Rect DisplaySettingsProvider::GetPrimaryScreenArea() const {

[oshima, 2012/10/10 17:58:23]

just FYI: I think this should be moved under ui at some point.

[scottmg, 2012/10/10 19:04:47]

Added TODO.

-  return gfx::Screen::GetPrimaryDisplay().bounds();
+  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+  return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds();
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
@@ -78,7 +79,8 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
   // screen (and overlap Dock). And we also want to exclude the system menu
   // area. Note that the rect returned from gfx::Screen util functions is in
   // platform-independent screen coordinates with (0, 0) as the top-left corner.
-  gfx::Display display = gfx::Screen::GetPrimaryDisplay();
+  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+  gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
   gfx::Rect display_area = display.bounds();
   gfx::Rect work_area = display.work_area();
   int system_menu_height = work_area.y() - display_area.y();
@@ -88,9 +90,11 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
   }
   return display_area;
 #else
-  gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
-#endif
+  // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+  gfx::Rect work_area =
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area();
   return work_area;
+#endif
 }
 
 void DisplaySettingsProvider::OnDisplaySettingsChanged() {