mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index e0dd7f6afc80a94191d454a1ac7c9b164fed17d9..dcb483055d60b33e5f10aba57a6c996d88a1661f 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -17,6 +17,10 @@
 #include "base/observer_list.h"
 #include "ui/base/ui_base_types.h"
 
+namespace display {
+class Display;
+}
+
 namespace gfx {
 class Point;
 }
@@ -158,13 +162,22 @@ class ASH_EXPORT WmShell {
   WmWindow* GetRootWindowForNewWindows();
 
   // Retuns the display info associated with |display_id|.
-  // TODO(msw): Remove this when DisplayManager has been moved. crbug.com/622480
+  // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual const DisplayInfo& GetDisplayInfo(int64_t display_id) const = 0;
 
   // Matches that of DisplayManager::IsActiveDisplayId().
-  // TODO: Remove this when DisplayManager has been moved. crbug.com/622480
+  // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
   virtual bool IsActiveDisplayId(int64_t display_id) const = 0;
 
+  // Returns true if the desktop is in unified mode.
+  // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
+  virtual bool IsInUnifiedMode() const = 0;
+
+  // Returns the first display; this is the first display listed by hardware,
+  // which corresponds to internal displays on devices with integrated displays.
+  // TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
+  virtual display::Display GetFirstDisplay() const = 0;
+
   // Returns true if the first window shown on first run should be
   // unconditionally maximized, overriding the heuristic that normally chooses
   // the window size.