| Index: chrome/browser/ui/cocoa/tabs/tab_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.h b/chrome/browser/ui/cocoa/tabs/tab_controller.h
|
| index 72bf49b748a8e70dc5e3382d0a7b59a594db0eed..ecff7906372e008f3bc598ef45d9819dc24e79db 100644
|
| --- a/chrome/browser/ui/cocoa/tabs/tab_controller.h
|
| +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.h
|
| @@ -21,7 +21,7 @@ enum TabLoadingState {
|
| kTabCrashed,
|
| };
|
|
|
| -@class MediaIndicatorButton;
|
| +@class AlertIndicatorButton;
|
| @class MenuController;
|
| namespace TabControllerInternal {
|
| class MenuDelegate;
|
| @@ -44,7 +44,7 @@ class MenuDelegate;
|
| @interface TabController : NSViewController<TabDraggingEventTarget> {
|
| @private
|
| base::scoped_nsobject<SpriteView> iconView_;
|
| - base::scoped_nsobject<MediaIndicatorButton> mediaIndicatorButton_;
|
| + base::scoped_nsobject<AlertIndicatorButton> alertIndicatorButton_;
|
| base::scoped_nsobject<HoverCloseButton> closeButton_;
|
|
|
| NSRect originalIconFrame_; // frame of iconView_ as loaded from nib
|
| @@ -75,7 +75,7 @@ class MenuDelegate;
|
| @property(assign, nonatomic) id target;
|
| @property(assign, nonatomic) GURL url;
|
| @property(readonly, nonatomic) NSView* iconView;
|
| -@property(readonly, nonatomic) MediaIndicatorButton* mediaIndicatorButton;
|
| +@property(readonly, nonatomic) AlertIndicatorButton* alertIndicatorButton;
|
| @property(readonly, nonatomic) HoverCloseButton* closeButton;
|
|
|
| // Default height for tabs.
|
| @@ -100,8 +100,8 @@ class MenuDelegate;
|
| - (void)setIconImage:(NSImage*)image;
|
| - (void)setIconImage:(NSImage*)image withToastAnimation:(BOOL)animate;
|
|
|
| -// Sets the current tab media state and updates the views.
|
| -- (void)setMediaState:(TabMediaState)mediaState;
|
| +// Sets the current tab alert state and updates the views.
|
| +- (void)setAlertState:(TabAlertState)alertState;
|
|
|
| // Closes the associated TabView by relaying the message to |target_| to
|
| // perform the close.
|
| @@ -127,7 +127,7 @@ class MenuDelegate;
|
| @interface TabController(TestingAPI)
|
| - (int)iconCapacity;
|
| - (BOOL)shouldShowIcon;
|
| -- (BOOL)shouldShowMediaIndicator;
|
| +- (BOOL)shouldShowAlertIndicator;
|
| - (BOOL)shouldShowCloseButton;
|
| @end // TabController(TestingAPI)
|
|
|
|
|