| Index: chrome/browser/ui/panels/panel_manager.cc
|
| diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
|
| index 01aa31d8e947d6a3af7614c145c9d34380c3b430..5b34d71b18d0ee71e2741f7649543e99230ca4f1 100644
|
| --- a/chrome/browser/ui/panels/panel_manager.cc
|
| +++ b/chrome/browser/ui/panels/panel_manager.cc
|
| @@ -252,8 +252,13 @@ int PanelManager::num_panels() const {
|
| return panel_strip_->num_panels() + panel_overflow_strip_->num_panels();
|
| }
|
|
|
| -const PanelManager::Panels& PanelManager::panels() const {
|
| - return panel_strip_->panels();
|
| +std::vector<Panel*> PanelManager::panels() const {
|
| + std::vector<Panel*> panels = panel_strip_->panels();
|
| + for (PanelOverflowStrip::Panels::const_iterator iter =
|
| + panel_overflow_strip_->panels().begin();
|
| + iter != panel_overflow_strip_->panels().end(); ++iter)
|
| + panels.push_back(*iter);
|
| + return panels;
|
| }
|
|
|
| void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
|
|
|