| Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| index 028c744d53dd56751ccc7c2e29262a534a056ffc..85239eb077dcc304cba4225feb80de256402c7bc 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -296,13 +296,32 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
|
| }
|
|
|
| void BrowserWindowCocoa::UpdateTitleBar() {
|
| - NSString* newTitle =
|
| - base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
|
| + NSString* newTitle = windowTitle();
|
|
|
| - pending_window_title_.reset(
|
| - [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
|
| - withNewTitle:newTitle
|
| - forWindow:window()]);
|
| + pending_window_title_.reset([BrowserWindowUtils
|
| + scheduleReplaceOldTitle:pending_window_title_.get()
|
| + withNewTitle:newTitle
|
| + forWindow:window()]);
|
| +}
|
| +
|
| +void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) {
|
| + media_state_ = media_state;
|
| + UpdateTitleBar();
|
| +}
|
| +
|
| +NSString* BrowserWindowCocoa::windowTitle() {
|
| + if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) {
|
| + return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC,
|
| + browser_->GetWindowTitleForCurrentTab());
|
| + } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) {
|
| + return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC,
|
| + browser_->GetWindowTitleForCurrentTab());
|
| + }
|
| + return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
|
| +}
|
| +
|
| +TabMediaState BrowserWindowCocoa::mediaState() {
|
| + return media_state_;
|
| }
|
|
|
| void BrowserWindowCocoa::BookmarkBarStateChanged(
|
|
|