Revert "Indicate in the Window menu which Chrome window has an active sound playing"

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 279 matching lines @@
 
 gfx::NativeWindow BrowserWindowCocoa::GetNativeWindow() const {
   return window();
 }
 
 StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
   return [controller_ statusBubble];
 }
 
 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(
     BookmarkBar::AnimateChangeType change_type) {
   [[controller_ bookmarkBarController]
       updateState:browser_->bookmark_bar_state()
        changeType:change_type];
 }
 
 void BrowserWindowCocoa::UpdateDevTools() {
@@ skipping 218 matching lines @@
     return gfx::Rect();
   NSRect tabRect = [controller_ selectedTabGrowBoxRect];
   return gfx::Rect(NSRectToCGRect(tabRect));
 }
 
 void BrowserWindowCocoa::AddFindBar(
     FindBarCocoaController* find_bar_cocoa_controller) {
   [controller_ addFindBar:find_bar_cocoa_controller];
 }
 
-void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) {
-  media_state_ = media_state;
-  UpdateTitleBar();
-}
-
 void BrowserWindowCocoa::ShowUpdateChromeDialog() {
   restart_browser::RequestRestart(window());
 }
 
 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url,
                                             bool already_bookmarked) {
   [controller_ showBookmarkBubbleForURL:url
                       alreadyBookmarked:(already_bookmarked ? YES : NO)];
 }
 
@@ skipping 307 matching lines @@
 void BrowserWindowCocoa::UnhideDownloadShelf() {
   GetDownloadShelf()->Unhide();
 }
 
 void BrowserWindowCocoa::HideDownloadShelf() {
   GetDownloadShelf()->Hide();
   StatusBubble* statusBubble = GetStatusBubble();
   if (statusBubble)
     statusBubble->Hide();
 }