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

ui/views/controls/menu/menu_controller.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 13 matching lines @@
 
 namespace aura {
 class RootWindow;
 class Window;
 }
 #endif
 
 namespace ui {
 class OSExchangeData;
 }
+namespace gfx {
+class Screen;
+}
 namespace views {
 
 class DropTargetEvent;
 class MenuButton;
 class MenuHostRootView;
 class MouseEvent;
 class SubmenuView;
 class View;
 
 namespace internal {
@@ skipping 410 matching lines @@
   // Handles the mouse location event on the submenu |source|.
   void HandleMouseLocation(SubmenuView* source,
                            const gfx::Point& mouse_location);
 
 #if defined(USE_AURA)
   // aura::client::ActivationChangeObserver overrides:
   virtual void OnWindowActivated(aura::Window* active,
                                  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_;
 
   // If true, Run blocks. If false, Run doesn't block and this is used for
   // drag and drop. Note that the semantics for drag and drop are slightly
   // different: cancel timer is kicked off any time the drag moves outside the
   // menu, mouse events do nothing...
   bool blocking_run_;
 
   // If true, we're showing.
@@ skipping 83 matching lines @@
   // How deep we are in nested message loops. This should be at most 2 (when
   // showing a context menu from a menu).
   int message_loop_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_