diff options
Diffstat (limited to 'chromium/ui/views/controls/combobox/combobox.h')
| -rw-r--r-- | chromium/ui/views/controls/combobox/combobox.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/ui/views/controls/combobox/combobox.h b/chromium/ui/views/controls/combobox/combobox.h index 812810cc3b3..fa781688732 100644 --- a/chromium/ui/views/controls/combobox/combobox.h +++ b/chromium/ui/views/controls/combobox/combobox.h @@ -9,7 +9,7 @@ #include <utility> #include "base/macros.h" -#include "base/scoped_observer.h" +#include "base/scoped_observation.h" #include "base/strings/string16.h" #include "base/time/time.h" #include "ui/base/models/combobox_model.h" @@ -224,7 +224,8 @@ class VIEWS_EXPORT Combobox : public View, // The focus ring for this Combobox. FocusRing* focus_ring_ = nullptr; - ScopedObserver<ui::ComboboxModel, ui::ComboboxModelObserver> observer_{this}; + base::ScopedObservation<ui::ComboboxModel, ui::ComboboxModelObserver> + observation_{this}; DISALLOW_COPY_AND_ASSIGN(Combobox); }; |