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

Side by Side Diff: chrome/browser/views/toolbar_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
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_TOOLBAR_VIEW_H__ 5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__
6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__ 6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // Create the contents of the Browser Toolbar 45 // Create the contents of the Browser Toolbar
46 void Init(Profile* profile); 46 void Init(Profile* profile);
47 47
48 // ChromeViews::View 48 // ChromeViews::View
49 virtual void Layout(); 49 virtual void Layout();
50 virtual void DidChangeBounds(const CRect& previous, const CRect& current); 50 virtual void DidChangeBounds(const CRect& previous, const CRect& current);
51 virtual void DidGainFocus(); 51 virtual void DidGainFocus();
52 virtual void WillLoseFocus(); 52 virtual void WillLoseFocus();
53 virtual bool OnKeyPressed(const ChromeViews::KeyEvent& e); 53 virtual bool OnKeyPressed(const ChromeViews::KeyEvent& e);
54 virtual bool OnKeyReleased(const ChromeViews::KeyEvent& e); 54 virtual bool OnKeyReleased(const ChromeViews::KeyEvent& e);
55 virtual void GetPreferredSize(CSize* out); 55 virtual gfx::Size GetPreferredSize();
56 56
57 // Overridden from EncodingMenuControllerDelegate: 57 // Overridden from EncodingMenuControllerDelegate:
58 virtual bool IsItemChecked(int id) const; 58 virtual bool IsItemChecked(int id) const;
59 59
60 // Overridden from Menu::BaseControllerDelegate: 60 // Overridden from Menu::BaseControllerDelegate:
61 virtual bool GetAcceleratorInfo(int id, ChromeViews::Accelerator* accel); 61 virtual bool GetAcceleratorInfo(int id, ChromeViews::Accelerator* accel);
62 62
63 // ChromeViews::MenuDelegate 63 // ChromeViews::MenuDelegate
64 virtual void RunMenu(ChromeViews::View* source, const CPoint& pt, HWND hwnd); 64 virtual void RunMenu(ChromeViews::View* source, const CPoint& pt, HWND hwnd);
65 65
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 // Controls whether or not a home button should be shown on the toolbar. 179 // Controls whether or not a home button should be shown on the toolbar.
180 BooleanPrefMember show_home_button_; 180 BooleanPrefMember show_home_button_;
181 181
182 // The display mode used when laying out the toolbar. 182 // The display mode used when laying out the toolbar.
183 DisplayMode display_mode_; 183 DisplayMode display_mode_;
184 }; 184 };
185 185
186 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__ 186 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H__
187 187
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698