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

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 423 matching lines @@
 }
 
 void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize(
     gfx::Rect* bounds) {
   if (command_line_.HasSwitch(switches::kAppWindowSize)) {
     int width, height;
     width = height = 0;
     std::string switch_value =
         command_line_.GetSwitchValueASCII(switches::kAppWindowSize);
     if (ParseCommaSeparatedIntegers(switch_value, &width, &height)) {
-      const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
+      const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay(
+          gfx::Screen::BadTwoWorldsContext()).work_area();

[oshima, 2012/10/04 20:18:26]

I guess session restore has to remember in which screen restoring window belongs
to?

       width = std::min(width, work_area.width());
       height = std::min(height, work_area.height());
       bounds->set_size(gfx::Size(width, height));
       bounds->set_x((work_area.width() - bounds->width()) / 2);
       // TODO(nkostylev): work_area does include launcher but should not.
       // Launcher auto hide pref is synced and is most likely not applied here.
       bounds->set_y((work_area.height() - bounds->height()) / 2);
     }
   }
 }
@@ skipping 546 matching lines @@
         // New:
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }