Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: ui/views/widget/widget.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
6 #define UI_VIEWS_WIDGET_WIDGET_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 // Creates and initializes a new InputMethod and returns it, otherwise null. 869 // Creates and initializes a new InputMethod and returns it, otherwise null.
870 scoped_ptr<InputMethod> CreateInputMethod(); 870 scoped_ptr<InputMethod> CreateInputMethod();
871 871
872 // Sets a different InputMethod instance to this widget. The instance 872 // Sets a different InputMethod instance to this widget. The instance
873 // must not be initialized, the ownership will be assumed by the widget. 873 // must not be initialized, the ownership will be assumed by the widget.
874 // It's only for testing purpose. 874 // It's only for testing purpose.
875 void ReplaceInputMethod(InputMethod* input_method); 875 void ReplaceInputMethod(InputMethod* input_method);
876 876
877 internal::NativeWidgetPrivate* native_widget_; 877 internal::NativeWidgetPrivate* native_widget_;
878 878
879 ObserverList<WidgetObserver> observers_; 879 base::ObserverList<WidgetObserver> observers_;
880 880
881 ObserverList<WidgetRemovalsObserver> removals_observers_; 881 base::ObserverList<WidgetRemovalsObserver> removals_observers_;
882 882
883 // Non-owned pointer to the Widget's delegate. If a NULL delegate is supplied 883 // Non-owned pointer to the Widget's delegate. If a NULL delegate is supplied
884 // to Init() a default WidgetDelegate is created. 884 // to Init() a default WidgetDelegate is created.
885 WidgetDelegate* widget_delegate_; 885 WidgetDelegate* widget_delegate_;
886 886
887 // The root of the View hierarchy attached to this window. 887 // The root of the View hierarchy attached to this window.
888 // WARNING: see warning in tooltip_manager_ for ordering dependencies with 888 // WARNING: see warning in tooltip_manager_ for ordering dependencies with
889 // this and tooltip_manager_. 889 // this and tooltip_manager_.
890 scoped_ptr<internal::RootView> root_view_; 890 scoped_ptr<internal::RootView> root_view_;
891 891
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 bool movement_disabled_; 978 bool movement_disabled_;
979 979
980 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 980 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
981 981
982 DISALLOW_COPY_AND_ASSIGN(Widget); 982 DISALLOW_COPY_AND_ASSIGN(Widget);
983 }; 983 };
984 984
985 } // namespace views 985 } // namespace views
986 986
987 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 987 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('k') | ui/views/win/windows_session_change_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698