| 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..d31991f98db3e7551330c62b4da0da2cfc3eada7 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -296,13 +296,25 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
|
| }
|
|
|
| void BrowserWindowCocoa::UpdateTitleBar() {
|
| - NSString* newTitle =
|
| - base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
|
| -
|
| - pending_window_title_.reset(
|
| - [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
|
| - withNewTitle:newTitle
|
| - forWindow:window()]);
|
| + NSString* newTitle = WindowTitle();
|
| +
|
| + pending_window_title_.reset([BrowserWindowUtils
|
| + scheduleReplaceOldTitle:pending_window_title_.get()
|
| + withNewTitle:newTitle
|
| + forWindow:window()]);
|
| +}
|
| +
|
| +NSString* BrowserWindowCocoa::WindowTitle() {
|
| + if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) {
|
| + return l10n_util::GetNSStringF(
|
| + IDS_WINDOW_AUDIO_PLAYING_MAC, browser_->GetWindowTitleForCurrentTab(),
|
| + base::SysNSStringToUTF16(media_playing_emoji()));
|
| + } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) {
|
| + return l10n_util::GetNSStringF(
|
| + IDS_WINDOW_AUDIO_MUTING_MAC, browser_->GetWindowTitleForCurrentTab(),
|
| + base::SysNSStringToUTF16(media_muting_emoji()));
|
| + }
|
| + return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
|
| }
|
|
|
| void BrowserWindowCocoa::BookmarkBarStateChanged(
|
| @@ -541,6 +553,11 @@ void BrowserWindowCocoa::AddFindBar(
|
| [controller_ addFindBar:find_bar_cocoa_controller];
|
| }
|
|
|
| +void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) {
|
| + media_state_ = media_state;
|
| + UpdateTitleBar();
|
| +}
|
| +
|
| void BrowserWindowCocoa::ShowUpdateChromeDialog() {
|
| restart_browser::RequestRestart(window());
|
| }
|
|
|