chrome/browser/views/frame/opaque_non_client_view.h - Issue 7344: Convert GetPreferredSize from:...

Side by Side Diff: chrome/browser/views/frame/opaque_non_client_view.h

Issue 7344: Convert GetPreferredSize from:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 12 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

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_	5 #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_

6 #define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_	6 #define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_

7	7

8 #include "chrome/browser/views/frame/opaque_frame.h"	8 #include "chrome/browser/views/frame/opaque_frame.h"

9 #include "chrome/browser/views/tab_icon_view.h"	9 #include "chrome/browser/views/tab_icon_view.h"

10 #include "chrome/views/non_client_view.h"	10 #include "chrome/views/non_client_view.h"

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 virtual gfx::Size CalculateWindowSizeForClientSize(int width,	49 virtual gfx::Size CalculateWindowSizeForClientSize(int width,

50 int height) const;	50 int height) const;

51 virtual CPoint GetSystemMenuPoint() const;	51 virtual CPoint GetSystemMenuPoint() const;

52 virtual int NonClientHitTest(const gfx::Point& point);	52 virtual int NonClientHitTest(const gfx::Point& point);

53 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);	53 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);

54 virtual void EnableClose(bool enable);	54 virtual void EnableClose(bool enable);

55	55

56 // Overridden from ChromeViews::View:	56 // Overridden from ChromeViews::View:

57 virtual void Paint(ChromeCanvas* canvas);	57 virtual void Paint(ChromeCanvas* canvas);

58 virtual void Layout();	58 virtual void Layout();

59 virtual void GetPreferredSize(CSize* out);	59 virtual gfx::Size GetPreferredSize();

60 virtual ChromeViews::View* GetViewForPoint(const gfx::Point& point,	60 virtual ChromeViews::View* GetViewForPoint(const gfx::Point& point,

61 bool can_create_floating);	61 bool can_create_floating);

62 virtual void DidChangeBounds(const CRect& previous, const CRect& current);	62 virtual void DidChangeBounds(const CRect& previous, const CRect& current);

63 virtual void ViewHierarchyChanged(bool is_add,	63 virtual void ViewHierarchyChanged(bool is_add,

64 ChromeViews::View* parent,	64 ChromeViews::View* parent,

65 ChromeViews::View* child);	65 ChromeViews::View* child);

66 virtual bool GetAccessibleRole(VARIANT* role);	66 virtual bool GetAccessibleRole(VARIANT* role);

67 virtual bool GetAccessibleName(std::wstring* name);	67 virtual bool GetAccessibleName(std::wstring* name);

68 virtual void SetAccessibleName(const std::wstring& name);	68 virtual void SetAccessibleName(const std::wstring& name);

69	69

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 static WindowResources* inactive_resources_;	141 static WindowResources* inactive_resources_;

142 static WindowResources* active_otr_resources_;	142 static WindowResources* active_otr_resources_;

143 static WindowResources* inactive_otr_resources_;	143 static WindowResources* inactive_otr_resources_;

144 static ChromeFont title_font_;	144 static ChromeFont title_font_;

145	145

146 DISALLOW_EVIL_CONSTRUCTORS(OpaqueNonClientView);	146 DISALLOW_EVIL_CONSTRUCTORS(OpaqueNonClientView);

147 };	147 };

148	148

149 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_	149 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_NON_CLIENT_VIEW_H_

150	150

OLD	NEW