| 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 2e52d63b39acdabc278f307c55d8d363c2048b04..3b3606a3f97d5bcc005fc1eeb46f9a9875993329 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -297,23 +297,13 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
|
| }
|
|
|
| void BrowserWindowCocoa::UpdateTitleBar() {
|
| - NSString* newTitle = WindowTitle();
|
| + NSString* newTitle =
|
| + base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
|
|
|
| - 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());
|
| - } 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());
|
| + pending_window_title_.reset(
|
| + [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
|
| + withNewTitle:newTitle
|
| + forWindow:window()]);
|
| }
|
|
|
| void BrowserWindowCocoa::BookmarkBarStateChanged(
|
| @@ -552,11 +542,6 @@ 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());
|
| }
|
|
|