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

Side by Side Diff: chrome/browser/ui/views/frame/app_panel_browser_frame_view.h

Issue 10821002: Makes the min window size include the OTR image and caption buttons on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 8 years, 5 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_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
7 7
8 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 8 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
9 #include "chrome/browser/ui/views/tab_icon_view_model.h" 9 #include "chrome/browser/ui/views/tab_icon_view_model.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 12 matching lines...) Expand all
23 class AppPanelBrowserFrameView : public BrowserNonClientFrameView, 23 class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
24 public views::ButtonListener, 24 public views::ButtonListener,
25 public chrome::TabIconViewModel { 25 public chrome::TabIconViewModel {
26 public: 26 public:
27 // Constructs a non-client view for an BrowserFrame. 27 // Constructs a non-client view for an BrowserFrame.
28 AppPanelBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); 28 AppPanelBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
29 virtual ~AppPanelBrowserFrameView(); 29 virtual ~AppPanelBrowserFrameView();
30 30
31 // Overridden from BrowserNonClientFrameView: 31 // Overridden from BrowserNonClientFrameView:
32 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 32 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
33 virtual int GetHorizontalTabStripVerticalOffset(bool restored) const OVERRIDE; 33 virtual TabStripInsets GetTabStripInsets(bool restored) const OVERRIDE;
34 virtual void UpdateThrobber(bool running) OVERRIDE; 34 virtual void UpdateThrobber(bool running) OVERRIDE;
35 virtual gfx::Size GetMinimumSize() OVERRIDE; 35 virtual gfx::Size GetMinimumSize() OVERRIDE;
36 36
37 protected: 37 protected:
38 // Overridden from views::NonClientFrameView: 38 // Overridden from views::NonClientFrameView:
39 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 39 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
40 virtual gfx::Rect GetWindowBoundsForClientBounds( 40 virtual gfx::Rect GetWindowBoundsForClientBounds(
41 const gfx::Rect& client_bounds) const OVERRIDE; 41 const gfx::Rect& client_bounds) const OVERRIDE;
42 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 42 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
43 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 43 virtual void GetWindowMask(const gfx::Size& size,
44 OVERRIDE; 44 gfx::Path* window_mask) OVERRIDE;
45 virtual void ResetWindowControls() OVERRIDE; 45 virtual void ResetWindowControls() OVERRIDE;
46 virtual void UpdateWindowIcon() OVERRIDE; 46 virtual void UpdateWindowIcon() OVERRIDE;
47 47
48 // Overridden from views::View: 48 // Overridden from views::View:
49 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 49 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
50 virtual void Layout() OVERRIDE; 50 virtual void Layout() OVERRIDE;
51 51
52 // Overridden from views::ButtonListener: 52 // Overridden from views::ButtonListener:
53 virtual void ButtonPressed(views::Button* sender, const views::Event& event) 53 virtual void ButtonPressed(views::Button* sender,
54 OVERRIDE; 54 const views::Event& event) OVERRIDE;
55 55
56 // Overridden from chrome::TabIconViewModel: 56 // Overridden from chrome::TabIconViewModel:
57 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 57 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
58 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 58 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
59 59
60 private: 60 private:
61 // Returns the thickness of the border that makes up the window frame edges. 61 // Returns the thickness of the border that makes up the window frame edges.
62 // This does not include any client edge. 62 // This does not include any client edge.
63 int FrameBorderThickness() const; 63 int FrameBorderThickness() const;
64 64
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // The Window icon. 104 // The Window icon.
105 TabIconView* window_icon_; 105 TabIconView* window_icon_;
106 106
107 // The bounds of the ClientView. 107 // The bounds of the ClientView.
108 gfx::Rect client_view_bounds_; 108 gfx::Rect client_view_bounds_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(AppPanelBrowserFrameView); 110 DISALLOW_COPY_AND_ASSIGN(AppPanelBrowserFrameView);
111 }; 111 };
112 112
113 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_ 113 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698