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

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

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
14 #include "chrome/browser/command_updater.h" 13 #include "chrome/browser/command_updater.h"
15 #include "chrome/browser/prefs/pref_member.h" 14 #include "chrome/browser/prefs/pref_member.h"
16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" 15 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
17 #include "chrome/browser/ui/views/accessible_pane_view.h" 16 #include "chrome/browser/ui/views/accessible_pane_view.h"
18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
19 #include "chrome/browser/ui/views/reload_button.h" 18 #include "chrome/browser/ui/views/reload_button.h"
20 #include "ui/base/animation/slide_animation.h" 19 #include "ui/base/animation/slide_animation.h"
21 #include "ui/base/models/accelerator.h" 20 #include "ui/base/models/accelerator.h"
22 #include "views/controls/button/menu_button.h" 21 #include "views/controls/button/menu_button.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // Controls whether or not a home button should be shown on the toolbar. 194 // Controls whether or not a home button should be shown on the toolbar.
196 BooleanPrefMember show_home_button_; 195 BooleanPrefMember show_home_button_;
197 196
198 // The display mode used when laying out the toolbar. 197 // The display mode used when laying out the toolbar.
199 DisplayMode display_mode_; 198 DisplayMode display_mode_;
200 199
201 // The contents of the wrench menu. 200 // The contents of the wrench menu.
202 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_; 201 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_;
203 202
204 // Wrench menu. 203 // Wrench menu.
205 scoped_refptr<WrenchMenu> wrench_menu_; 204 scoped_ptr<WrenchMenu> wrench_menu_;
206 205
207 // Vector of listeners to receive callbacks when the menu opens. 206 // Vector of listeners to receive callbacks when the menu opens.
208 std::vector<views::MenuListener*> menu_listeners_; 207 std::vector<views::MenuListener*> menu_listeners_;
209 208
210 NotificationRegistrar registrar_; 209 NotificationRegistrar registrar_;
211 210
212 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); 211 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
213 }; 212 };
214 213
215 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_ 214 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698