mash: Move more shelf files to ash/common/shelf.

ash/screen_util.cc

 // Copyright 2014 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.
 
 #include "ash/screen_util.h"
 
+#include "ash/common/shelf/shelf_widget.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace ash {
 
@@ skipping 54 matching lines @@
 const display::Display& ScreenUtil::GetSecondaryDisplay() {
   DisplayManager* display_manager = GetDisplayManager();
   CHECK_LE(2U, display_manager->GetNumDisplays());
   return display_manager->GetDisplayAt(0).id() ==
                  display::Screen::GetScreen()->GetPrimaryDisplay().id()
              ? display_manager->GetDisplayAt(1)
              : display_manager->GetDisplayAt(0);
 }
 
 }  // namespace ash