Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

ui/gfx/screen.h

 // Copyright (c) 2011 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_GFX_SCREEN_H_
 #define UI_GFX_SCREEN_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 
 // A utility class for getting various info about screen size, monitors,
 // cursor position, etc.
 // TODO(erikkay) add more of those methods here
 class UI_EXPORT Screen {
  public:
   virtual ~Screen() {}
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   // Sets the instance to use. This takes owernship of |screen|, deleting the
   // old instance. This is used on aura to avoid circular dependencies between
   // ui and aura.
   static void SetInstance(Screen* screen);
 #endif
 
   // Returns the current absolute position of the mouse pointer.
   static gfx::Point GetCursorScreenPoint();
 
   // Returns the work area of the monitor nearest the specified window.
@@ skipping 47 matching lines @@
 private:
 #if defined(USE_AURA)
   // The singleton screen instance. Only used on aura.
   static Screen* instance_;
 #endif
 };
 
 }  // namespace gfx
 
 #endif  // VIEWS_SCREEN_H_