| Index: ash/display/display_manager.h
|
| diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
|
| index 11b995558ea2235be241f2d01e5f716379fd81f1..fcbd7dd844fc21ceecf74a5d980a9943cd34af25 100644
|
| --- a/ash/display/display_manager.h
|
| +++ b/ash/display/display_manager.h
|
| @@ -17,7 +17,7 @@
|
| #include "ui/gfx/display.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#include "ui/display/chromeos/output_configurator.h"
|
| +#include "ui/display/chromeos/display_configurator.h"
|
| #endif
|
|
|
| namespace gfx {
|
| @@ -44,7 +44,7 @@ class SystemGestureEventFilterTest;
|
| // TODO(oshima): Make this non internal.
|
| class ASH_EXPORT DisplayManager
|
| #if defined(OS_CHROMEOS)
|
| - : public ui::OutputConfigurator::SoftwareMirroringController
|
| + : public ui::DisplayConfigurator::SoftwareMirroringController
|
| #endif
|
| {
|
| public:
|
|
|