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

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

Issue 2730015: Mac/clang: Uncontentious fixes. (Closed)
Patch Set: '' 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"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 // A dictionary of Extension ID -> BrowserActionButton pairs representing the 49 // A dictionary of Extension ID -> BrowserActionButton pairs representing the
50 // buttons present in the container view. The ID is a string unique to each 50 // buttons present in the container view. The ID is a string unique to each
51 // extension. 51 // extension.
52 scoped_nsobject<NSMutableDictionary> buttons_; 52 scoped_nsobject<NSMutableDictionary> buttons_;
53 53
54 // Array of hidden buttons in the correct order in which the user specified. 54 // Array of hidden buttons in the correct order in which the user specified.
55 scoped_nsobject<NSMutableArray> hiddenButtons_; 55 scoped_nsobject<NSMutableArray> hiddenButtons_;
56 56
57 // The currently running chevron animation (fade in/out). 57 // The currently running chevron animation (fade in/out).
58 scoped_nsobject<NSAnimation> chevronAnimation_; 58 scoped_nsobject<NSViewAnimation> chevronAnimation_;
59 59
60 // The chevron button used when Browser Actions are hidden. 60 // The chevron button used when Browser Actions are hidden.
61 scoped_nsobject<MenuButton> chevronMenuButton_; 61 scoped_nsobject<MenuButton> chevronMenuButton_;
62 62
63 // The Browser Actions overflow menu. 63 // The Browser Actions overflow menu.
64 scoped_nsobject<NSMenu> overflowMenu_; 64 scoped_nsobject<NSMenu> overflowMenu_;
65 } 65 }
66 66
67 @property(readonly, nonatomic) BrowserActionsContainerView* containerView; 67 @property(readonly, nonatomic) BrowserActionsContainerView* containerView;
68 68
(...skipping 41 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