Chromium Code Reviews| 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 c472ded473ebc6492283481f6464cf39875647ce..67269ca06c2aa6e3b33495050877cbb5a6b27d81 100644 |
| --- a/chrome/browser/ui/panels/base_panel_browser_test.cc |
| +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc |
| @@ -89,8 +89,19 @@ 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()); |
| + |
|
Dmitry Titov
2012/04/12 01:18:59
Does it make sense to add
DCHECK(!display_area_ob
|
| + ObserverListBase<DisplaySettingsProvider::DesktopBarObserver>::Iterator |
| + desktop_bar_observer_iter(old_provider->desktop_bar_observers()); |
| + AddDesktopBarObserver(desktop_bar_observer_iter.GetNext()); |
| + |
| + ObserverListBase<DisplaySettingsProvider::FullScreenObserver>::Iterator |
| + full_screen_observer_iter(old_provider->full_screen_observers()); |
| + AddFullScreenObserver(full_screen_observer_iter.GetNext()); |
| + |
| panel_manager->set_display_settings_provider(this); |
| memset(mock_desktop_bars, 0, sizeof(mock_desktop_bars)); |