diff options
Diffstat (limited to 'chromium/ui/wm/core/focus_controller.h')
| -rw-r--r-- | chromium/ui/wm/core/focus_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/ui/wm/core/focus_controller.h b/chromium/ui/wm/core/focus_controller.h index 19014a7c255..42f7c0c7d47 100644 --- a/chromium/ui/wm/core/focus_controller.h +++ b/chromium/ui/wm/core/focus_controller.h @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/optional.h" #include "base/scoped_multi_source_observation.h" #include "base/strings/string_piece.h" +#include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h" @@ -130,7 +130,7 @@ class WM_CORE_EXPORT FocusController : public ActivationClient, // An optional value. It is set to the window being activated and is unset // after it is activated. - base::Optional<aura::Window*> pending_activation_; + absl::optional<aura::Window*> pending_activation_; std::unique_ptr<FocusRules> rules_; |