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

Unified Diff: chrome/browser/ui/panels/base_panel_browser_test.cc

Issue 10051020: Move full-screen detection logic from PanelManager to DisplaySettingsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux asan Created 8 years, 8 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 | « no previous file | chrome/browser/ui/panels/display_settings_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/base_panel_browser_test.cc
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index c67a59057ad73bcf03e4422c7fc7b6b11bbbdf6e..79f5b60b072806c6b2c975542aecb1d87e3be3a4 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -89,8 +89,22 @@ MockDisplaySettingsProviderImpl::MockDisplaySettingsProviderImpl(
PanelManager* panel_manager) {
DisplaySettingsProvider* old_provider =
panel_manager->display_settings_provider();
- set_display_area_observer(old_provider->display_area_observer());
- set_desktop_bar_observer(old_provider->desktop_bar_observer());
+
+ ObserverListBase<DisplaySettingsProvider::DisplayAreaObserver>::Iterator
+ display_area_observers_iter(old_provider->display_area_observers());
+ AddDisplayAreaObserver(display_area_observers_iter.GetNext());
+ DCHECK(!display_area_observers_iter.GetNext());
+
+ ObserverListBase<DisplaySettingsProvider::DesktopBarObserver>::Iterator
+ desktop_bar_observer_iter(old_provider->desktop_bar_observers());
+ AddDesktopBarObserver(desktop_bar_observer_iter.GetNext());
+ DCHECK(!desktop_bar_observer_iter.GetNext());
+
+ ObserverListBase<DisplaySettingsProvider::FullScreenObserver>::Iterator
+ full_screen_observer_iter(old_provider->full_screen_observers());
+ AddFullScreenObserver(full_screen_observer_iter.GetNext());
+ DCHECK(!full_screen_observer_iter.GetNext());
+
panel_manager->set_display_settings_provider(this);
memset(mock_desktop_bars, 0, sizeof(mock_desktop_bars));
« no previous file with comments | « no previous file | chrome/browser/ui/panels/display_settings_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698