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

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

Issue 8872044: Add test cases for panel overflow handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final patch to land Created 9 years 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 | « chrome/browser/ui/panels/panel_manager.h ('k') | chrome/browser/ui/panels/panel_mouse_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.h ('k') | chrome/browser/ui/panels/panel_mouse_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698