| Index: ash/display/window_tree_host_manager.h
|
| diff --git a/ash/display/window_tree_host_manager.h b/ash/display/window_tree_host_manager.h
|
| index 91896164c79784b9477e534e2d675f6ce4cd398d..f80b229350bf647b3c0f8dd5bc667a9be45496da 100644
|
| --- a/ash/display/window_tree_host_manager.h
|
| +++ b/ash/display/window_tree_host_manager.h
|
| @@ -157,9 +157,7 @@ class ASH_EXPORT WindowTreeHostManager
|
| void CloseMirroringDisplayIfNotNecessary() override;
|
| void PreDisplayConfigurationChange(bool clear_focus) override;
|
| void PostDisplayConfigurationChange(bool must_clear_window) override;
|
| -#if defined(OS_CHROMEOS)
|
| ui::DisplayConfigurator* display_configurator() override;
|
| -#endif
|
|
|
| // ui::internal::InputMethodDelegate overrides:
|
| ui::EventDispatchDetails DispatchKeyEventPostIME(
|
| @@ -172,7 +170,6 @@ class ASH_EXPORT WindowTreeHostManager
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, BoundsUpdated);
|
| FRIEND_TEST_ALL_PREFIXES(WindowTreeHostManagerTest, SecondaryDisplayLayout);
|
| - friend class DisplayManager;
|
| friend class MirrorWindowController;
|
|
|
| // Creates a WindowTreeHost for |display| and stores it in the
|
|
|