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

chrome/browser/chromeos/extensions/wallpaper_manager_util.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/chromeos/extensions/wallpaper_manager_util.h"
 
+#include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 38 matching lines @@
       return;
 
     const extensions::Extension* extension =
         service->GetExtensionById(extension_misc::kWallpaperManagerId, false);
     if (!extension)
       return;
 
     GURL wallpaper_picker_url(url);
     int width = extension->launch_width();
     int height = extension->launch_height();
-    const gfx::Size screen = gfx::Screen::GetPrimaryDisplay().size();
+    // TODO(oshima|bshe): Open WallpaperManager in the display is is requested.
+    const gfx::Size screen =
+        ash::Shell::GetAshScreen()->GetPrimaryDisplay().size();
     const gfx::Rect bounds((screen.width() - width) / 2,
                            (screen.height() - height) / 2,
                            width,
                            height);
 
     Browser* browser = GetBrowserForUrl(wallpaper_picker_url);
 
     if (!browser) {
       browser = new Browser(
           Browser::CreateParams::CreateForApp(Browser::TYPE_POPUP,
                                               extension->name(),
                                               bounds,
                                               profile));
 
       chrome::AddSelectedTabWithURL(browser, wallpaper_picker_url,
                                     content::PAGE_TRANSITION_LINK);
     }
     browser->window()->Show();
   } else {
     Browser* browser = browser::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
     chrome::ShowSettingsSubPage(browser, "setWallpaper");
   }
 }
 
 }  // namespace wallpaper_manager_util