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

ui/views/controls/menu/menu_controller.h

Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index e29b1a147ae623b1a520bc9eef399dd20957b379..cb477d131a99fa998a5b47e103c6dcd2442677d8 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -31,6 +31,9 @@ class Window;
 namespace ui {
 class OSExchangeData;
 }
+namespace gfx {
+class Screen;
+}
 namespace views {
 
 class DropTargetEvent;
@@ -461,6 +464,9 @@ class VIEWS_EXPORT MenuController
                                  aura::Window* old_active) OVERRIDE;
 #endif
 
+  // Retrieve an appropriate Screen.
+  gfx::Screen* GetScreen() const;

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

const gfx::Screen

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

Done.

+
   // The active instance.
   static MenuController* active_instance_;