summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/content/display/screen_orientation_controller_chromeos.h2
-rw-r--r--ash/desktop_background/desktop_background_controller.h2
-rw-r--r--ash/display/display_controller.h2
-rw-r--r--ash/display/screen_ash.h2
-rw-r--r--ash/first_run/first_run_helper.h4
-rw-r--r--ash/shelf/shelf_button.cc2
-rw-r--r--ash/shelf/shelf_item_delegate_manager.h2
-rw-r--r--ash/shelf/shelf_layout_manager.h2
-rw-r--r--ash/shelf/shelf_model.h2
-rw-r--r--ash/shelf/shelf_view.h2
-rw-r--r--ash/shell.h2
-rw-r--r--ash/system/chromeos/network/vpn_delegate.h2
-rw-r--r--ash/system/chromeos/power/power_status.h2
-rw-r--r--ash/system/tray/system_tray_notifier.h39
-rw-r--r--ash/system/user/user_accounts_delegate.h2
-rw-r--r--ash/test/test_shell_delegate.h3
-rw-r--r--ash/wm/dock/docked_window_layout_manager.h2
-rw-r--r--ash/wm/lock_state_controller.h2
-rw-r--r--ash/wm/video_detector.h2
-rw-r--r--ash/wm/window_state.h2
20 files changed, 41 insertions, 39 deletions
diff --git a/ash/content/display/screen_orientation_controller_chromeos.h b/ash/content/display/screen_orientation_controller_chromeos.h
index 0a84b8c..93ac053 100644
--- a/ash/content/display/screen_orientation_controller_chromeos.h
+++ b/ash/content/display/screen_orientation_controller_chromeos.h
@@ -179,7 +179,7 @@ class ASH_EXPORT ScreenOrientationController
gfx::Display::Rotation current_rotation_;
// Rotation Lock observers.
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
// Tracks all windows that have requested a lock, as well as the requested
// orientation.
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index ba865fd..ebebeaa 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -148,7 +148,7 @@ class ASH_EXPORT DesktopBackgroundController
SkColor background_color_;
- ObserverList<DesktopBackgroundControllerObserver> observers_;
+ base::ObserverList<DesktopBackgroundControllerObserver> observers_;
// The current wallpaper.
scoped_ptr<wallpaper::WallpaperResizer> current_wallpaper_;
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index bb476ef..40e3ed2 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -207,7 +207,7 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
// The mapping from display ID to its window tree host.
WindowTreeHostMap window_tree_hosts_;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
// Store the primary window tree host temporarily while replacing
// display.
diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
index d30ad36..8139bf3f 100644
--- a/ash/display/screen_ash.h
+++ b/ash/display/screen_ash.h
@@ -52,7 +52,7 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
// It simply has a copy of the displays.
gfx::Screen* CloneForShutdown();
- ObserverList<gfx::DisplayObserver> observers_;
+ base::ObserverList<gfx::DisplayObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
};
diff --git a/ash/first_run/first_run_helper.h b/ash/first_run/first_run_helper.h
index 42bc697..a2b1508 100644
--- a/ash/first_run/first_run_helper.h
+++ b/ash/first_run/first_run_helper.h
@@ -71,10 +71,10 @@ class ASH_EXPORT FirstRunHelper {
virtual gfx::Rect GetHelpButtonBounds() = 0;
protected:
- ObserverList<Observer>& observers() { return observers_; }
+ base::ObserverList<Observer>& observers() { return observers_; }
private:
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
DISALLOW_COPY_AND_ASSIGN(FirstRunHelper);
};
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
index 388bf48..a6dc835 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/shelf/shelf_button.cc
@@ -98,7 +98,7 @@ class ShelfButtonAnimation : public gfx::AnimationDelegate {
}
gfx::ThrobAnimation animation_;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
DISALLOW_COPY_AND_ASSIGN(ShelfButtonAnimation);
};
diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h
index d2e77b9..b19b3a5 100644
--- a/ash/shelf/shelf_item_delegate_manager.h
+++ b/ash/shelf/shelf_item_delegate_manager.h
@@ -75,7 +75,7 @@ class ASH_EXPORT ShelfItemDelegateManager : public ShelfModelObserver {
ShelfIDToItemDelegateMap id_to_item_delegate_map_;
- ObserverList<ShelfItemDelegateManagerObserver> observers_;
+ base::ObserverList<ShelfItemDelegateManagerObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateManager);
};
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 96f405e..240e765 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -376,7 +376,7 @@ class ASH_EXPORT ShelfLayoutManager
// EventFilter used to detect when user issues a gesture on a bezel sensor.
scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_;
- ObserverList<ShelfLayoutManagerObserver> observers_;
+ base::ObserverList<ShelfLayoutManagerObserver> observers_;
// The shelf reacts to gesture-drags, and can be set to auto-hide for certain
// gestures. Some shelf behaviour (e.g. visibility state, background color
diff --git a/ash/shelf/shelf_model.h b/ash/shelf/shelf_model.h
index 3b57c2a..8c683c6 100644
--- a/ash/shelf/shelf_model.h
+++ b/ash/shelf/shelf_model.h
@@ -91,7 +91,7 @@ class ASH_EXPORT ShelfModel {
ShelfItems items_;
Status status_;
- ObserverList<ShelfModelObserver> observers_;
+ base::ObserverList<ShelfModelObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(ShelfModel);
};
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 2bfb4fa..82ea7fa 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -372,7 +372,7 @@ class ASH_EXPORT ShelfView : public views::View,
scoped_ptr<views::MenuRunner> launcher_menu_runner_;
- ObserverList<ShelfIconObserver> observers_;
+ base::ObserverList<ShelfIconObserver> observers_;
// Amount content is inset on the left edge (or top edge for vertical
// alignment).
diff --git a/ash/shell.h b/ash/shell.h
index cb46540..41af348 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -757,7 +757,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
::wm::CursorManager cursor_manager_;
#endif // defined(OS_CHROMEOS)
- ObserverList<ShellObserver> observers_;
+ base::ObserverList<ShellObserver> observers_;
// For testing only: simulate that a modal window is open
bool simulate_modal_window_open_for_testing_;
diff --git a/ash/system/chromeos/network/vpn_delegate.h b/ash/system/chromeos/network/vpn_delegate.h
index b614ce2..aaf76a3 100644
--- a/ash/system/chromeos/network/vpn_delegate.h
+++ b/ash/system/chromeos/network/vpn_delegate.h
@@ -91,7 +91,7 @@ class ASH_EXPORT VPNDelegate {
void NotifyObservers();
private:
- ObserverList<Observer, true> observer_list_;
+ base::ObserverList<Observer, true> observer_list_;
DISALLOW_COPY_AND_ASSIGN(VPNDelegate);
};
diff --git a/ash/system/chromeos/power/power_status.h b/ash/system/chromeos/power/power_status.h
index 8397e66..8cf2933 100644
--- a/ash/system/chromeos/power/power_status.h
+++ b/ash/system/chromeos/power/power_status.h
@@ -139,7 +139,7 @@ class ASH_EXPORT PowerStatus : public chromeos::PowerManagerClient::Observer {
// Overriden from PowerManagerClient::Observer.
void PowerChanged(const power_manager::PowerSupplyProperties& proto) override;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
// Current state.
power_manager::PowerSupplyProperties proto_;
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
index 29bba2a..b46cb9a 100644
--- a/ash/system/tray/system_tray_notifier.h
+++ b/ash/system/tray/system_tray_notifier.h
@@ -150,27 +150,28 @@ class ASH_EXPORT SystemTrayNotifier {
#endif
private:
- ObserverList<AccessibilityObserver> accessibility_observers_;
- ObserverList<AudioObserver> audio_observers_;
- ObserverList<BluetoothObserver> bluetooth_observers_;
- ObserverList<ClockObserver> clock_observers_;
- ObserverList<IMEObserver> ime_observers_;
- ObserverList<LocaleObserver> locale_observers_;
- ObserverList<TracingObserver> tracing_observers_;
- ObserverList<UpdateObserver> update_observers_;
- ObserverList<UserObserver> user_observers_;
+ base::ObserverList<AccessibilityObserver> accessibility_observers_;
+ base::ObserverList<AudioObserver> audio_observers_;
+ base::ObserverList<BluetoothObserver> bluetooth_observers_;
+ base::ObserverList<ClockObserver> clock_observers_;
+ base::ObserverList<IMEObserver> ime_observers_;
+ base::ObserverList<LocaleObserver> locale_observers_;
+ base::ObserverList<TracingObserver> tracing_observers_;
+ base::ObserverList<UpdateObserver> update_observers_;
+ base::ObserverList<UserObserver> user_observers_;
#if defined(OS_CHROMEOS)
- ObserverList<LogoutButtonObserver> logout_button_observers_;
- ObserverList<SessionLengthLimitObserver> session_length_limit_observers_;
- ObserverList<NetworkObserver> network_observers_;
- ObserverList<NetworkPortalDetectorObserver>
+ base::ObserverList<LogoutButtonObserver> logout_button_observers_;
+ base::ObserverList<SessionLengthLimitObserver>
+ session_length_limit_observers_;
+ base::ObserverList<NetworkObserver> network_observers_;
+ base::ObserverList<NetworkPortalDetectorObserver>
network_portal_detector_observers_;
- ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
- ObserverList<MediaCaptureObserver> media_capture_observers_;
- ObserverList<ScreenCaptureObserver> screen_capture_observers_;
- ObserverList<ScreenShareObserver> screen_share_observers_;
- ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
- ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
+ base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
+ base::ObserverList<MediaCaptureObserver> media_capture_observers_;
+ base::ObserverList<ScreenCaptureObserver> screen_capture_observers_;
+ base::ObserverList<ScreenShareObserver> screen_share_observers_;
+ base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
+ base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
#endif
DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
diff --git a/ash/system/user/user_accounts_delegate.h b/ash/system/user/user_accounts_delegate.h
index 2c42843..e25e291 100644
--- a/ash/system/user/user_accounts_delegate.h
+++ b/ash/system/user/user_accounts_delegate.h
@@ -55,7 +55,7 @@ class ASH_EXPORT UserAccountsDelegate {
void NotifyAccountListChanged();
private:
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
DISALLOW_COPY_AND_ASSIGN(UserAccountsDelegate);
};
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9b273fc..06ac471 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -76,7 +76,8 @@ class TestShellDelegate : public ShellDelegate {
scoped_ptr<content::BrowserContext> active_browser_context_;
scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
- ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
+ base::ObserverList<ash::VirtualKeyboardStateObserver>
+ keyboard_state_observer_list_;
TestSessionStateDelegate* test_session_state_delegate_; // Not owned.
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/dock/docked_window_layout_manager.h
index aad8804..c2a2afa 100644
--- a/ash/wm/dock/docked_window_layout_manager.h
+++ b/ash/wm/dock/docked_window_layout_manager.h
@@ -324,7 +324,7 @@ class ASH_EXPORT DockedWindowLayoutManager
scoped_ptr<DockedBackgroundWidget> background_widget_;
// Observers of dock bounds changes.
- ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
+ base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
};
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index 035797a..df92f94 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -283,7 +283,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
scoped_ptr<LockStateControllerDelegate> delegate_;
- ObserverList<LockStateObserver> observers_;
+ base::ObserverList<LockStateObserver> observers_;
// The current login status, or original login status from before we locked.
user::LoginStatus login_status_;
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h
index 0735b09..ca1a3e5 100644
--- a/ash/wm/video_detector.h
+++ b/ash/wm/video_detector.h
@@ -88,7 +88,7 @@ class ASH_EXPORT VideoDetector : public aura::EnvObserver,
// Maps from a window that we're tracking to information about it.
WindowInfoMap window_infos_;
- ObserverList<VideoDetectorObserver> observers_;
+ base::ObserverList<VideoDetectorObserver> observers_;
// Last time at which we notified observers that a video was playing.
base::TimeTicks last_observer_notification_time_;
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index cc46273..f74d9be 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -370,7 +370,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
// restored when only this one window gets shown.
scoped_ptr<gfx::Rect> pre_auto_manage_window_bounds_;
- ObserverList<WindowStateObserver> observer_list_;
+ base::ObserverList<WindowStateObserver> observer_list_;
// True to ignore a property change event to avoid reentrance in
// UpdateWindowStateType()
generated by cgit v1.1 at 2024-09-08 05:49:50 +0000