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

Side by Side Diff: chrome/browser/ui/panels/detached_panel_strip.h

Issue 9560002: Cleanup to keep panel from manipulating its panel strip assignment directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed final nits Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_ 5 #ifndef CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_
6 #define CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_ 6 #define CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 10 matching lines...) Expand all
21 public: 21 public:
22 typedef std::set<Panel*> Panels; 22 typedef std::set<Panel*> Panels;
23 23
24 explicit DetachedPanelStrip(PanelManager* panel_manager); 24 explicit DetachedPanelStrip(PanelManager* panel_manager);
25 virtual ~DetachedPanelStrip(); 25 virtual ~DetachedPanelStrip();
26 26
27 // PanelStrip OVERRIDES: 27 // PanelStrip OVERRIDES:
28 virtual void SetDisplayArea(const gfx::Rect& display_area) OVERRIDE; 28 virtual void SetDisplayArea(const gfx::Rect& display_area) OVERRIDE;
29 virtual void RefreshLayout() OVERRIDE; 29 virtual void RefreshLayout() OVERRIDE;
30 virtual void AddPanel(Panel* panel) OVERRIDE; 30 virtual void AddPanel(Panel* panel) OVERRIDE;
31 virtual bool RemovePanel(Panel* panel) OVERRIDE; 31 virtual void RemovePanel(Panel* panel) OVERRIDE;
32 virtual void CloseAll() OVERRIDE; 32 virtual void CloseAll() OVERRIDE;
33 virtual void ResizePanelWindow( 33 virtual void ResizePanelWindow(
34 Panel* panel, 34 Panel* panel,
35 const gfx::Size& preferred_window_size) OVERRIDE; 35 const gfx::Size& preferred_window_size) OVERRIDE;
36 virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE; 36 virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
37 virtual void ActivatePanel(Panel* panel) OVERRIDE; 37 virtual void ActivatePanel(Panel* panel) OVERRIDE;
38 virtual void MinimizePanel(Panel* panel) OVERRIDE; 38 virtual void MinimizePanel(Panel* panel) OVERRIDE;
39 virtual void RestorePanel(Panel* panel) OVERRIDE; 39 virtual void RestorePanel(Panel* panel) OVERRIDE;
40 virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
40 virtual bool CanShowPanelAsActive(const Panel* panel) const OVERRIDE; 41 virtual bool CanShowPanelAsActive(const Panel* panel) const OVERRIDE;
41 virtual bool CanDragPanel(const Panel* panel) const OVERRIDE; 42 virtual bool CanDragPanel(const Panel* panel) const OVERRIDE;
42 virtual void StartDraggingPanel(Panel* panel) OVERRIDE; 43 virtual void StartDraggingPanel(Panel* panel) OVERRIDE;
43 virtual void DragPanel(Panel* panel, int delta_x, int delta_y) OVERRIDE; 44 virtual void DragPanel(Panel* panel, int delta_x, int delta_y) OVERRIDE;
44 virtual void EndDraggingPanel(Panel* panel, bool cancelled) OVERRIDE; 45 virtual void EndDraggingPanel(Panel* panel, bool cancelled) OVERRIDE;
45 46
46 bool HasPanel(Panel* panel) const; 47 bool HasPanel(Panel* panel) const;
47 48
48 int num_panels() const { return panels_.size(); } 49 int num_panels() const { return panels_.size(); }
49 const Panels& panels() const { return panels_; } 50 const Panels& panels() const { return panels_; }
50 51
51 private: 52 private:
52 PanelManager* panel_manager_; // Weak, owns us. 53 PanelManager* panel_manager_; // Weak, owns us.
53 54
54 // All panels in the panel strip must fit within this area. 55 // All panels in the panel strip must fit within this area.
55 gfx::Rect display_area_; 56 gfx::Rect display_area_;
56 57
57 // Collection of all panels. 58 // Collection of all panels.
58 Panels panels_; 59 Panels panels_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(DetachedPanelStrip); 61 DISALLOW_COPY_AND_ASSIGN(DetachedPanelStrip);
61 }; 62 };
62 63
63 #endif // CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_ 64 #endif // CHROME_BROWSER_UI_PANELS_DETACHED_PANEL_STRIP_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/detached_panel_browsertest.cc ('k') | chrome/browser/ui/panels/detached_panel_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698