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

Side by Side Diff: ash/wm/panels/panel_frame_view.h

Issue 25270004: Fix bugs wrt to the content edge for v1 apps and panels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit as per jamescook@ Created 7 years, 2 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
« no previous file with comments | « no previous file | ash/wm/panels/panel_frame_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 5 #ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/aura/aura_export.h" 10 #include "ui/aura/aura_export.h"
(...skipping 23 matching lines...) Expand all
34 34
35 PanelFrameView(views::Widget* frame, FrameType frame_type); 35 PanelFrameView(views::Widget* frame, FrameType frame_type);
36 virtual ~PanelFrameView(); 36 virtual ~PanelFrameView();
37 37
38 // Overridden from views::View: 38 // Overridden from views::View:
39 virtual const char* GetClassName() const OVERRIDE; 39 virtual const char* GetClassName() const OVERRIDE;
40 40
41 private: 41 private:
42 void InitFramePainter(); 42 void InitFramePainter();
43 43
44 // Height from top of window to top of client area.
45 int NonClientTopBorderHeight() const;
46
44 // Overridden from views::NonClientFrameView: 47 // Overridden from views::NonClientFrameView:
45 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 48 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
46 virtual gfx::Rect GetWindowBoundsForClientBounds( 49 virtual gfx::Rect GetWindowBoundsForClientBounds(
47 const gfx::Rect& client_bounds) const OVERRIDE; 50 const gfx::Rect& client_bounds) const OVERRIDE;
48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 51 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
49 virtual void GetWindowMask(const gfx::Size& size, 52 virtual void GetWindowMask(const gfx::Size& size,
50 gfx::Path* window_mask) OVERRIDE; 53 gfx::Path* window_mask) OVERRIDE;
51 virtual void ResetWindowControls() OVERRIDE; 54 virtual void ResetWindowControls() OVERRIDE;
52 virtual void UpdateWindowIcon() OVERRIDE; 55 virtual void UpdateWindowIcon() OVERRIDE;
53 virtual void UpdateWindowTitle() OVERRIDE; 56 virtual void UpdateWindowTitle() OVERRIDE;
(...skipping 11 matching lines...) Expand all
65 views::ImageView* window_icon_; 68 views::ImageView* window_icon_;
66 gfx::Rect client_view_bounds_; 69 gfx::Rect client_view_bounds_;
67 const gfx::Font title_font_; 70 const gfx::Font title_font_;
68 71
69 DISALLOW_COPY_AND_ASSIGN(PanelFrameView); 72 DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
70 }; 73 };
71 74
72 } 75 }
73 76
74 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 77 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/panels/panel_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698