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

Unified Diff: ash/test/test_shell_delegate.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, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/user/user_accounts_delegate.h ('k') | ash/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9b273fc9a48134bae5f9f2e6d7420b1e8ee5fdba..06ac471924492ea94db030dd4a6ad82349db5f88 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.
« no previous file with comments | « ash/system/user/user_accounts_delegate.h ('k') | ash/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698