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

Side by Side Diff: chrome/browser/ui/views/toolbar_view.h

Issue 10832184: Fixed memory leak. Untangled confusing code with menu initialization and ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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_TOOLBAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // unacknowledged background pages in the system. 207 // unacknowledged background pages in the system.
208 gfx::ImageSkia GetBackgroundPageBadge(); 208 gfx::ImageSkia GetBackgroundPageBadge();
209 209
210 // Layout the location bar for the Extended Instant NTP. 210 // Layout the location bar for the Extended Instant NTP.
211 void LayoutLocationBarNTP(); 211 void LayoutLocationBarNTP();
212 212
213 // Sets the bounds of the LocationBarContainer. |bounds| is in the coordinates 213 // Sets the bounds of the LocationBarContainer. |bounds| is in the coordinates
214 // of |this|. 214 // of |this|.
215 void SetLocationBarContainerBounds(const gfx::Rect& bounds); 215 void SetLocationBarContainerBounds(const gfx::Rect& bounds);
216 216
217 scoped_ptr<BackForwardMenuModel> back_menu_model_;
218 scoped_ptr<BackForwardMenuModel> forward_menu_model_;
219
220 // The model that contains the security level, text, icon to display... 217 // The model that contains the security level, text, icon to display...
221 ToolbarModel* model_; 218 ToolbarModel* model_;
222 219
223 // Controls 220 // Controls
224 views::ImageButton* back_; 221 views::ImageButton* back_;
225 views::ImageButton* forward_; 222 views::ImageButton* forward_;
226 ReloadButton* reload_; 223 ReloadButton* reload_;
227 views::ImageButton* home_; 224 views::ImageButton* home_;
228 LocationBarView* location_bar_; 225 LocationBarView* location_bar_;
229 LocationBarContainer* location_bar_container_; 226 LocationBarContainer* location_bar_container_;
(...skipping 15 matching lines...) Expand all
245 242
246 // A list of listeners to call when the menu opens. 243 // A list of listeners to call when the menu opens.
247 ObserverList<views::MenuListener> menu_listeners_; 244 ObserverList<views::MenuListener> menu_listeners_;
248 245
249 content::NotificationRegistrar registrar_; 246 content::NotificationRegistrar registrar_;
250 247
251 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 248 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
252 }; 249 };
253 250
254 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 251 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/button_dropdown_test.cc ('k') | chrome/browser/ui/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698