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

Side by Side Diff: chrome/browser/cocoa/toolbar_controller.h

Issue 2856042: [Mac] Implement the update available notification in the wrench menu. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Observe notification Created 10 years, 5 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
« no previous file with comments | « chrome/browser/cocoa/restart_browser.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_COCOA_TOOLBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
(...skipping 10 matching lines...) Expand all
21 @class BackForwardMenuController; 21 @class BackForwardMenuController;
22 class Browser; 22 class Browser;
23 @class BrowserActionsController; 23 @class BrowserActionsController;
24 class CommandUpdater; 24 class CommandUpdater;
25 @class DelayedMenuButton; 25 @class DelayedMenuButton;
26 class LocationBar; 26 class LocationBar;
27 class LocationBarViewMac; 27 class LocationBarViewMac;
28 @class MenuButton; 28 @class MenuButton;
29 namespace ToolbarControllerInternal { 29 namespace ToolbarControllerInternal {
30 class MenuDelegate; 30 class MenuDelegate;
31 class PrefObserverBridge; 31 class NotificationBridge;
32 } // namespace ToolbarControllerInternal 32 } // namespace ToolbarControllerInternal
33 class Profile; 33 class Profile;
34 @class ReloadButton; 34 @class ReloadButton;
35 class TabContents; 35 class TabContents;
36 class ToolbarModel; 36 class ToolbarModel;
37 @class WrenchMenuController; 37 @class WrenchMenuController;
38 class WrenchMenuModel; 38 class WrenchMenuModel;
39 39
40 // A controller for the toolbar in the browser window. Manages 40 // A controller for the toolbar in the browser window. Manages
41 // updating the state for location bar and back/fwd/reload/go buttons. 41 // updating the state for location bar and back/fwd/reload/go buttons.
(...skipping 28 matching lines...) Expand all
70 scoped_nsobject<BackForwardMenuController> forwardMenuController_; 70 scoped_nsobject<BackForwardMenuController> forwardMenuController_;
71 scoped_nsobject<BrowserActionsController> browserActionsController_; 71 scoped_nsobject<BrowserActionsController> browserActionsController_;
72 72
73 // Lazily-instantiated model and delegate for the menu on the 73 // Lazily-instantiated model and delegate for the menu on the
74 // wrench button. Once visible, it will be non-null, but will not 74 // wrench button. Once visible, it will be non-null, but will not
75 // reaped when the menu is hidden once it is initially shown. 75 // reaped when the menu is hidden once it is initially shown.
76 scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_; 76 scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
77 scoped_ptr<WrenchMenuModel> wrenchMenuModel_; 77 scoped_ptr<WrenchMenuModel> wrenchMenuModel_;
78 78
79 // Used for monitoring the optional toolbar button prefs. 79 // Used for monitoring the optional toolbar button prefs.
80 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; 80 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;
81 BooleanPrefMember showHomeButton_; 81 BooleanPrefMember showHomeButton_;
82 BooleanPrefMember showPageOptionButtons_; 82 BooleanPrefMember showPageOptionButtons_;
83 BOOL hasToolbar_; // If NO, we may have only the location bar. 83 BOOL hasToolbar_; // If NO, we may have only the location bar.
84 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 84 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
85 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size. 85 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
86 86
87 // We have an extra retain in the locationBar_. 87 // We have an extra retain in the locationBar_.
88 // See comments in awakeFromNib for more info. 88 // See comments in awakeFromNib for more info.
89 scoped_nsobject<AutocompleteTextField> locationBarRetainer_; 89 scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
90 90
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // Returns an array of views in the order of the outlets above. 178 // Returns an array of views in the order of the outlets above.
179 - (NSArray*)toolbarViews; 179 - (NSArray*)toolbarViews;
180 - (void)showOptionalHomeButton; 180 - (void)showOptionalHomeButton;
181 - (void)installWrenchMenu; 181 - (void)installWrenchMenu;
182 - (WrenchMenuController*)wrenchMenuController; 182 - (WrenchMenuController*)wrenchMenuController;
183 // Return a hover button for the current event. 183 // Return a hover button for the current event.
184 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 184 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
185 @end 185 @end
186 186
187 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 187 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/restart_browser.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698