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..21ae5b66fd834b9bf22473b56254a9aa88bec7f4 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 {
-  return gfx::Screen::GetPrimaryDisplay().bounds();
+  return gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).bounds();
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
@@ -88,7 +89,8 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
   }
   return display_area;
 #else
-  gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).work_area();
 #endif
   return work_area;
 }