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

ash/shell.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 ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/cursor_delegate.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/shelf_types.h"
 #include "ash/wm/system_modal_container_event_filter_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #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;
 
 namespace aura {
 class EventFilter;
 class FocusManager;
 class RootWindow;
 class Window;
 namespace client {
@@ skipping 131 matching lines @@
   // Returns the primary RootWindow. The primary RootWindow is the one
   // that has a launcher.
   static aura::RootWindow* GetPrimaryRootWindow();
 
   // Returns the active RootWindow. The active RootWindow is the one that
   // contains the current active window as a decendant child. The active
   // RootWindow remains the same even when the active window becomes NULL,
   // 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();
 
   static aura::Window* GetContainer(aura::RootWindow* root_window,
                                     int container_id);
   static const aura::Window* GetContainer(const aura::RootWindow* root_window,
                                           int container_id);
 
   // Returns the list of containers that match |container_id| in
   // all root windows.
@@ skipping 324 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_