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

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 044ba06d5c4d6ba79b2fd7d444aa21cf44810819..f005854354fdfca1e6dc52e2e4e9793dd5acd1e4 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -20,6 +20,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 
 class CommandLine;
@@ -171,6 +172,9 @@ class ASH_EXPORT Shell : CursorDelegate,
   // until the another window who has a different root window becomes active.
   static aura::RootWindow* GetActiveRootWindow();
 
+  // Returns the global Screen object that's always active in ash.
+  static gfx::Screen* GetAshScreen();

[Ben Goodger (Google), 2012/10/10 22:52:10]

imma be that guy that's gonna ask you to call this GetScreen(), ash being
implied since you are on the ash::Shell object.

[scottmg, 2012/10/11 00:22:28]

imma be the guy crying in the refactoring corner. But you're right.

Done.

+
   // Returns all root windows.
   static RootWindowList GetAllRootWindows();