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

Side by Side Diff: chrome/browser/cocoa/extensions/browser_action_button.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_ACTION_BUTTON_H_ 5 #ifndef CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
6 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ 6 #define CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_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 22 matching lines...) Expand all
33 // extension's icon. 33 // extension's icon.
34 scoped_ptr<ExtensionImageTrackerBridge> imageLoadingBridge_; 34 scoped_ptr<ExtensionImageTrackerBridge> imageLoadingBridge_;
35 35
36 // The default icon of the Button. 36 // The default icon of the Button.
37 scoped_nsobject<NSImage> defaultIcon_; 37 scoped_nsobject<NSImage> defaultIcon_;
38 38
39 // The icon specific to the active tab. 39 // The icon specific to the active tab.
40 scoped_nsobject<NSImage> tabSpecificIcon_; 40 scoped_nsobject<NSImage> tabSpecificIcon_;
41 41
42 // Used to move the button and query whether a button is currently animating. 42 // Used to move the button and query whether a button is currently animating.
43 scoped_nsobject<NSAnimation> moveAnimation_; 43 scoped_nsobject<NSViewAnimation> moveAnimation_;
44 44
45 // The extension for this button. Weak. 45 // The extension for this button. Weak.
46 Extension* extension_; 46 Extension* extension_;
47 47
48 // The ID of the active tab. 48 // The ID of the active tab.
49 int tabId_; 49 int tabId_;
50 50
51 // Whether the button is currently being dragged. 51 // Whether the button is currently being dragged.
52 BOOL isBeingDragged_; 52 BOOL isBeingDragged_;
53 53
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // The action we're drawing the cell for. Weak. 89 // The action we're drawing the cell for. Weak.
90 ExtensionAction* extensionAction_; 90 ExtensionAction* extensionAction_;
91 } 91 }
92 92
93 @property(readwrite, nonatomic) int tabId; 93 @property(readwrite, nonatomic) int tabId;
94 @property(readwrite, nonatomic) ExtensionAction* extensionAction; 94 @property(readwrite, nonatomic) ExtensionAction* extensionAction;
95 95
96 @end 96 @end
97 97
98 #endif // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_ 98 #endif // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTION_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698