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

Side by Side Diff: chrome/browser/views/old_frames/simple_xp_frame.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
OLDNEW
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_OLD_FRAMES_SIMPLE_XP_FRAME_H__ 5 #ifndef CHROME_BROWSER_VIEWS_OLD_FRAMES_SIMPLE_XP_FRAME_H__
6 #define CHROME_BROWSER_VIEWS_OLD_FRAMES_SIMPLE_XP_FRAME_H__ 6 #define CHROME_BROWSER_VIEWS_OLD_FRAMES_SIMPLE_XP_FRAME_H__
7 7
8 #include "chrome/browser/views/location_bar_view.h" 8 #include "chrome/browser/views/location_bar_view.h"
9 #include "chrome/browser/views/old_frames/xp_frame.h" 9 #include "chrome/browser/views/old_frames/xp_frame.h"
10 #include "chrome/browser/views/tab_icon_view.h" 10 #include "chrome/browser/views/tab_icon_view.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 //////////////////////////////////////////////////////////////////////////////// 101 ////////////////////////////////////////////////////////////////////////////////
102 class TitleBarMenuButton : public ChromeViews::MenuButton { 102 class TitleBarMenuButton : public ChromeViews::MenuButton {
103 public: 103 public:
104 explicit TitleBarMenuButton(SimpleXPFrameTitleBar* title_bar); 104 explicit TitleBarMenuButton(SimpleXPFrameTitleBar* title_bar);
105 virtual ~TitleBarMenuButton(); 105 virtual ~TitleBarMenuButton();
106 106
107 // Set the contents view which is the view presenting the menu icon. 107 // Set the contents view which is the view presenting the menu icon.
108 void SetContents(ChromeViews::View* contents); 108 void SetContents(ChromeViews::View* contents);
109 109
110 // overridden from View 110 // overridden from View
111 virtual void GetPreferredSize(CSize *out); 111 virtual gfx::Size GetPreferredSize();
112 virtual void Paint(ChromeCanvas* canvas); 112 virtual void Paint(ChromeCanvas* canvas);
113 virtual bool OnMousePressed(const ChromeViews::MouseEvent& e); 113 virtual bool OnMousePressed(const ChromeViews::MouseEvent& e);
114 114
115 private: 115 private:
116 // The drop arrow icon. 116 // The drop arrow icon.
117 SkBitmap* drop_arrow_; 117 SkBitmap* drop_arrow_;
118 118
119 // The contents is an additional view positioned before the drop down. 119 // The contents is an additional view positioned before the drop down.
120 ChromeViews::View* contents_; 120 ChromeViews::View* contents_;
121 121
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 // Lazily created chrome icon. Created and used as the icon in the 169 // Lazily created chrome icon. Created and used as the icon in the
170 // TabIconView for all non-Application windows. 170 // TabIconView for all non-Application windows.
171 SkBitmap* chrome_icon_; 171 SkBitmap* chrome_icon_;
172 172
173 DISALLOW_EVIL_CONSTRUCTORS(SimpleXPFrameTitleBar); 173 DISALLOW_EVIL_CONSTRUCTORS(SimpleXPFrameTitleBar);
174 }; 174 };
175 175
176 #endif // CHROME_BROWSER_VIEWS_OLD_FRAMES_SIMPLE_XP_FRAME_H__ 176 #endif // CHROME_BROWSER_VIEWS_OLD_FRAMES_SIMPLE_XP_FRAME_H__
177 177
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698