Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/panels/panel_manager.h" | 5 #include "chrome/browser/ui/panels/panel_manager.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "chrome/browser/fullscreen.h" | 9 #include "chrome/browser/fullscreen.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 227 } | 227 } |
| 228 | 228 |
| 229 int PanelManager::num_panels() const { | 229 int PanelManager::num_panels() const { |
| 230 return panel_strip_->num_panels() + panel_overflow_strip_->num_panels(); | 230 return panel_strip_->num_panels() + panel_overflow_strip_->num_panels(); |
| 231 } | 231 } |
| 232 | 232 |
| 233 bool PanelManager::is_dragging_panel() const { | 233 bool PanelManager::is_dragging_panel() const { |
| 234 return panel_strip_->is_dragging_panel(); | 234 return panel_strip_->is_dragging_panel(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 const PanelManager::Panels& PanelManager::panels() const { | 237 std::vector<Panel*> PanelManager::panels() const { |
| 238 return panel_strip_->panels(); | 238 std::vector<Panel*> panels = panel_strip_->panels(); |
| 239 for (int i = 0; i < panel_overflow_strip_->num_panels(); ++i) | |
|
jennb
2011/12/08 23:52:00
Using an iterator will reduce amount of code that
jianli
2011/12/09 22:39:07
Done.
| |
| 240 panels.push_back(panel_overflow_strip_->panels()[i]); | |
| 241 return panels; | |
| 239 } | 242 } |
| OLD | NEW |