Revert "chromeos: Move files in //ash/common to //ash, part 3"

ash/system/web_notification/ash_popup_alignment_delegate.h

 // 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.
 
 #ifndef ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 #define ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
 
 #include <stdint.h>
 
 #include "ash/ash_export.h"
+#include "ash/common/shell_observer.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/shelf/wm_shelf_observer.h"
-#include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/views/popup_alignment_delegate.h"
 
 namespace display {
 class Screen;
 }
 
 namespace ash {
@@ skipping 61 matching lines @@
   gfx::Rect work_area_;
   WmShelf* shelf_;
   int tray_bubble_height_;
 
   DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_