SetDeviceScaleFactorForTest

ui/aura/test/test_screen.h

 // Copyright (c) 2012 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_AURA_TEST_TEST_SCREEN_H_
 #define UI_AURA_TEST_TEST_SCREEN_H_
 
+#include <memory>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display.h"
+#include "ui/display/display_change_notifier.h"
 #include "ui/display/screen.h"
 
 namespace gfx {
 class Insets;
 class Rect;
 class Transform;
 }
 
 namespace aura {
+//namespace test {
 class Window;
 class WindowTreeHost;
 
 // A minimal, testing Aura implementation of display::Screen.
 // TODO(bruthig): Consider extending gfx::test::TestScreen.
 class TestScreen : public display::Screen, public WindowObserver {
  public:
   // Creates a display::Screen of the specified size. If no size is specified,
   // then creates a 800x600 screen. |size| is in physical pixels.
   static TestScreen* Create(const gfx::Size& size);
   ~TestScreen() override;
 
-  WindowTreeHost* CreateHostForPrimaryDisplay();
+  void CreateHostForPrimaryDisplay();
 
-  void SetDeviceScaleFactor(float device_scale_fator);
+  aura::WindowTreeHost* host() { return host_.get(); }
+
+  // void SetDeviceScaleFactor(float device_scale_fator);
   void SetDisplayRotation(display::Display::Rotation rotation);
   void SetUIScale(float ui_scale);
   void SetWorkAreaInsets(const gfx::Insets& insets);
 
   // display::Screen overrides:
   display::Display GetPrimaryDisplay() const override;
+  void SetDeviceScaleFactorForTest(float scale_factor) override;
 
  protected:
   gfx::Transform GetRotationTransform() const;
   gfx::Transform GetUIScaleTransform() const;
 
   // WindowObserver overrides:
   void OnWindowBoundsChanged(Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
-  void OnWindowDestroying(Window* window) override;
 
   // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
   int GetNumDisplays() const override;
   std::vector<display::Display> GetAllDisplays() const override;
   display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
   display::Display GetDisplayNearestPoint(
       const gfx::Point& point) const override;
   display::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const override;
   void AddObserver(display::DisplayObserver* observer) override;
   void RemoveObserver(display::DisplayObserver* observer) override;
 
  private:
   explicit TestScreen(const gfx::Rect& screen_bounds);
 
-  aura::WindowTreeHost* host_;
+  display::DisplayChangeNotifier notifier_;
+
+  std::unique_ptr<aura::WindowTreeHost> host_;
 
   display::Display display_;
 
   float ui_scale_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScreen);
 };
-
+//}  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_SCREEN_H_