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

Side by Side Diff: chrome/browser/cocoa/extensions/browser_actions_controller.h

Issue 2769014: Mac/clang: Possibly contentious changes. (Closed)
Patch Set: comments2 Created 10 years, 6 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
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_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #import "base/scoped_nsobject.h" 10 #import "base/scoped_nsobject.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 12
13 class Browser; 13 class Browser;
14 @class BrowserActionButton; 14 @class BrowserActionButton;
15 @class BrowserActionsContainerView; 15 @class BrowserActionsContainerView;
16 class Extension; 16 class Extension;
17 @class ExtensionPopupController; 17 @class ExtensionPopupController;
18 class ExtensionToolbarModel; 18 class ExtensionToolbarModel;
19 class ExtensionsServiceObserverBridge; 19 class ExtensionsServiceObserverBridge;
20 @class MenuButton; 20 @class MenuButton;
21 class PrefService; 21 class PrefService;
22 class Profile; 22 class Profile;
23 23
24 // The padding between browser action buttons. 24 // The padding between browser action buttons.
25 extern const CGFloat kBrowserActionButtonPadding; 25 extern const CGFloat kBrowserActionButtonPadding;
26 26
27 // Sent when the visibility of the Browser Actions changes. 27 // Sent when the visibility of the Browser Actions changes.
28 extern const NSString* kBrowserActionVisibilityChangedNotification; 28 extern NSString* const kBrowserActionVisibilityChangedNotification;
29 29
30 // Handles state and provides an interface for controlling the Browser Actions 30 // Handles state and provides an interface for controlling the Browser Actions
31 // container within the Toolbar. 31 // container within the Toolbar.
32 @interface BrowserActionsController : NSObject { 32 @interface BrowserActionsController : NSObject {
33 @private 33 @private
34 // Reference to the current browser. Weak. 34 // Reference to the current browser. Weak.
35 Browser* browser_; 35 Browser* browser_;
36 36
37 // The view from Toolbar.xib we'll be rendering our browser actions in. Weak. 37 // The view from Toolbar.xib we'll be rendering our browser actions in. Weak.
38 BrowserActionsContainerView* containerView_; 38 BrowserActionsContainerView* containerView_;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // Registers the user preferences used by this class. 110 // Registers the user preferences used by this class.
111 + (void)registerUserPrefs:(PrefService*)prefs; 111 + (void)registerUserPrefs:(PrefService*)prefs;
112 112
113 @end // @interface BrowserActionsController 113 @end // @interface BrowserActionsController
114 114
115 @interface BrowserActionsController(TestingAPI) 115 @interface BrowserActionsController(TestingAPI)
116 - (NSButton*)buttonWithIndex:(NSUInteger)index; 116 - (NSButton*)buttonWithIndex:(NSUInteger)index;
117 @end 117 @end
118 118
119 #endif // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_ 119 #endif // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698