| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_MOJO_INIT_UI_INIT_H_ | 5 #ifndef UI_MOJO_INIT_UI_INIT_H_ |
| 6 #define UI_MOJO_INIT_UI_INIT_H_ | 6 #define UI_MOJO_INIT_UI_INIT_H_ |
| 7 | 7 |
| 8 #include <vector> |
| 9 |
| 8 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 9 #include "base/callback_forward.h" | 11 #include "base/callback_forward.h" |
| 10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 11 | 13 |
| 12 namespace gfx { | 14 namespace gfx { |
| 15 class Display; |
| 13 class Screen; | 16 class Screen; |
| 14 class Size; | |
| 15 } | 17 } |
| 16 | 18 |
| 17 namespace ui { | 19 namespace ui { |
| 18 class GestureConfiguration; | 20 class GestureConfiguration; |
| 19 | 21 |
| 20 namespace mojo { | 22 namespace mojo { |
| 21 | 23 |
| 22 class GestureConfigurationMojo; | 24 class GestureConfigurationMojo; |
| 23 | 25 |
| 24 // UIInit configures any state needed by apps that make use of ui classes (not | 26 // UIInit configures any state needed by apps that make use of ui classes (not |
| 25 // including aura). | 27 // including aura). |
| 26 class UIInit { | 28 class UIInit { |
| 27 public: | 29 public: |
| 28 UIInit(const gfx::Size& screen_size_in_pixels, float device_pixel_ratio); | 30 explicit UIInit(const std::vector<gfx::Display>& displays); |
| 29 ~UIInit(); | 31 ~UIInit(); |
| 30 | 32 |
| 31 private: | 33 private: |
| 32 scoped_ptr<gfx::Screen> screen_; | 34 scoped_ptr<gfx::Screen> screen_; |
| 33 #if defined(OS_ANDROID) | 35 #if defined(OS_ANDROID) |
| 34 scoped_ptr<GestureConfigurationMojo> gesture_configuration_; | 36 scoped_ptr<GestureConfigurationMojo> gesture_configuration_; |
| 35 #endif | 37 #endif |
| 36 | 38 |
| 37 DISALLOW_COPY_AND_ASSIGN(UIInit); | 39 DISALLOW_COPY_AND_ASSIGN(UIInit); |
| 38 }; | 40 }; |
| 39 | 41 |
| 40 } // namespace mojo | 42 } // namespace mojo |
| 41 } // namespace ui | 43 } // namespace ui |
| 42 | 44 |
| 43 #endif // UI_MOJO_INIT_UI_INIT_H_ | 45 #endif // UI_MOJO_INIT_UI_INIT_H_ |
| OLD | NEW |