Revert of Start of display management for mus

components/mus/ws/display_manager.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 COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
 #define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
-#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/display_manager_delegate.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace cc {
 class CompositorFrame;
 class SurfaceIdAllocator;
 class SurfaceManager;
@@ skipping 19 matching lines @@
 class SurfacesState;
 class TopLevelDisplayClient;
 
 namespace ws {
 
 class DisplayManagerFactory;
 class EventDispatcher;
 class ServerWindow;
 
 // DisplayManager is used to connect the root ServerWindow to a display.
-// TODO(sky): rename this given we have a mojom type with the same name now.
 class DisplayManager {
  public:
   virtual ~DisplayManager() {}
 
   static DisplayManager* Create(
       mojo::ApplicationImpl* app_impl,
       const scoped_refptr<GpuState>& gpu_state,
       const scoped_refptr<SurfacesState>& surfaces_state);
 
   virtual void Init(DisplayManagerDelegate* delegate) = 0;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   virtual void SchedulePaint(const ServerWindow* window,
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCursorById(int32_t cursor) = 0;
 
-  virtual mojom::Rotation GetRotation() = 0;
-
   virtual const mojom::ViewportMetrics& GetViewportMetrics() = 0;
 
   virtual void UpdateTextInputState(const ui::TextInputState& state) = 0;
   virtual void SetImeVisibility(bool visible) = 0;
 
   // Returns true if a compositor frame has been submitted but not drawn yet.
   virtual bool IsFramePending() const = 0;
 
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
@@ skipping 17 matching lines @@
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(DisplayManagerDelegate* delegate) override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCursorById(int32_t cursor) override;
   const mojom::ViewportMetrics& GetViewportMetrics() override;
-  mojom::Rotation GetRotation() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
   bool IsFramePending() const override;
 
  private:
   void WantToDraw();
 
   // This method initiates a top level redraw of the display.
   // TODO(fsamuel): This should use vblank as a signal rather than a timer
   // http://crbug.com/533042
@@ skipping 39 matching lines @@
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_