| Index: ash/display/display_controller.h
|
| diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
|
| index 00c1ac60309ac718e18964cc8ecaa4d66f4d4d84..d70350600dad7a2ecd355eba55ccafe23be9dbbe 100644
|
| --- a/ash/display/display_controller.h
|
| +++ b/ash/display/display_controller.h
|
| @@ -36,6 +36,10 @@ class Display;
|
| class Insets;
|
| }
|
|
|
| +namespace ui {
|
| +class ContextFactory;
|
| +}
|
| +
|
| namespace ash {
|
| class AshWindowTreeHost;
|
| struct AshWindowTreeHostInitParams;
|
| @@ -71,7 +75,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
|
| virtual ~Observer() {}
|
| };
|
|
|
| - DisplayController();
|
| + explicit DisplayController(ui::ContextFactory* context_factory);
|
| virtual ~DisplayController();
|
|
|
| void Start();
|
| @@ -195,6 +199,8 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
|
| DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
|
| };
|
|
|
| + ui::ContextFactory* context_factory_;
|
| +
|
| // The limiter to throttle how fast a user can
|
| // change the display configuration.
|
| scoped_ptr<DisplayChangeLimiter> limiter_;
|
|
|