| 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 f014b8ea4b09790469b311e3ee7dab37a2cb9cde..cb03a9b83df28ff9098ca0b9f581188eddf65535 100644
|
| --- a/ash/display/window_tree_host_manager.h
|
| +++ b/ash/display/window_tree_host_manager.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_DISPLAY_DISPLAY_CONTROLLER_H_
|
| -#define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
|
| +#ifndef ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
|
| +#define ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -166,8 +166,6 @@ class ASH_EXPORT WindowTreeHostManager
|
| #if defined(OS_CHROMEOS)
|
| ui::DisplayConfigurator* display_configurator() override;
|
| #endif
|
| - std::string GetInternalDisplayNameString() override;
|
| - std::string GetUnknownDisplayNameString() override;
|
|
|
| // ui::internal::InputMethodDelegate overrides:
|
| ui::EventDispatchDetails DispatchKeyEventPostIME(
|
| @@ -229,4 +227,4 @@ class ASH_EXPORT WindowTreeHostManager
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_DISPLAY_DISPLAY_CONTROLLER_H_
|
| +#endif // ASH_DISPLAY_WINDOW_TREE_HOST_MANAGER_H_
|
|
|