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

chrome/browser/ui/cocoa/tabs/tab_strip_controller.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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 27 matching lines @@
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
+#include "chrome/browser/ui/tabs/tab_utils.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/url_formatter/url_fixer.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 186 matching lines @@
 - (NSInteger)numberOfOpenPinnedTabs;
 - (NSInteger)numberOfOpenNonPinnedTabs;
 - (void)mouseMoved:(NSEvent*)event;
 - (void)setTabTrackingAreasEnabled:(BOOL)enabled;
 - (void)droppingURLsAt:(NSPoint)point
             givesIndex:(NSInteger*)index
            disposition:(WindowOpenDisposition*)disposition;
 - (void)setNewTabButtonHoverState:(BOOL)showHover;
 - (void)themeDidChangeNotification:(NSNotification*)notification;
 - (void)setNewTabImages;
-- (BOOL)isAnyOtherTab:(content::WebContents*)selected
-            withState:(TabMediaState)state;
-
 @end
 
 // A simple view class that contains the traffic light buttons. This class
 // ensures that the buttons display the icons when the mouse hovers over
 // them by overriding the _mouseInGroup method.
 @interface CustomWindowControlsView : NSView {
  @private
   BOOL mouseInside_;
 }
 
@@ skipping 1006 matching lines @@
 // a canned string if |contents| is NULL.
 - (void)setTabTitle:(TabController*)tab withContents:(WebContents*)contents {
   base::string16 title;
   if (contents)
     title = contents->GetTitle();
   if (title.empty())
     title = l10n_util::GetStringUTF16(IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED);
   [tab setTitle:base::SysUTF16ToNSString(title)];
 
   const base::string16& toolTip = chrome::AssembleTabTooltipText(
-      title, [self mediaStateForContents:contents]);
+      title, chrome::GetTabMediaStateForContents(contents));
   [tab setToolTip:base::SysUTF16ToNSString(toolTip)];
 }
 
 // Called when a notification is received from the model to insert a new tab
 // at |modelIndex|.
 - (void)insertTabWithContents:(content::WebContents*)contents
                       atIndex:(NSInteger)modelIndex
                  inForeground:(bool)inForeground {
   DCHECK(contents);
   DCHECK(modelIndex == TabStripModel::kNoTab ||
@@ skipping 332 matching lines @@
       } else if (newState == kTabCrashed) {
         [tabController setIconImage:sadFaviconImage withToastAnimation:YES];
       } else {
         [tabController setIconImage:throbberImage];
       }
     } else {
       [tabController setIconImage:nil];
     }
   }
 
-  TabMediaState mediaState = [self mediaStateForContents:contents];
-
-  [self updateWindowMediaState:mediaState on:contents];
-  [tabController setMediaState:mediaState];
+  [tabController setMediaState:chrome::GetTabMediaStateForContents(contents)];
 
   [tabController updateVisibility];
 }
 
 // Called when a notification is received from the model that the given tab
 // has been updated. |loading| will be YES when we only want to update the
 // throbber state, not anything else about the (partially) loading tab.
 - (void)tabChangedWithContents:(content::WebContents*)contents
                        atIndex:(NSInteger)modelIndex
                     changeType:(TabStripModelObserver::TabChangeType)change {
@@ skipping 644 matching lines @@
   }
 }
 
 - (void)removeCustomWindowControls {
   if (customWindowControls_)
     [permanentSubviews_ removeObject:customWindowControls_];
   [self regenerateSubviewList];
   [customWindowControls_ setMouseInside:NO];
 }
 
-// Gets the tab and the media state to check whether the window
-// media state should be updated or not. If the tab media state is
-// AUDIO_PLAYING, the window media state should be set to AUDIO_PLAYING.
-// If the tab media state is AUDIO_MUTING, this method would check if the
-// window has no other tab with state AUDIO_PLAYING, then the window
-// media state will be set to AUDIO_MUTING. If the tab media state is NONE,
-// this method checks if the window has no playing or muting tab, then window
-// media state will be set as NONE.
-- (void)updateWindowMediaState:(TabMediaState)mediaState
-                            on:(content::WebContents*)selected {
-  NSWindow* window = [tabStripView_ window];
-  BrowserWindowController* windowController =
-      [BrowserWindowController browserWindowControllerForWindow:window];
-  if (mediaState == TAB_MEDIA_STATE_NONE) {
-    if (![self isAnyOtherTab:selected
-                   withState:TAB_MEDIA_STATE_AUDIO_PLAYING] &&
-        ![self isAnyOtherTab:selected withState:TAB_MEDIA_STATE_AUDIO_MUTING]) {
-      [windowController setMediaState:TAB_MEDIA_STATE_NONE];
-    } else if ([self isAnyOtherTab:selected
-                         withState:TAB_MEDIA_STATE_AUDIO_MUTING]) {
-      [windowController setMediaState:TAB_MEDIA_STATE_AUDIO_MUTING];
-    }
-  } else if (mediaState == TAB_MEDIA_STATE_AUDIO_MUTING) {
-    if (![self isAnyOtherTab:selected withState:TAB_MEDIA_STATE_AUDIO_PLAYING])
-      [windowController setMediaState:TAB_MEDIA_STATE_AUDIO_MUTING];
-  } else {
-    [windowController setMediaState:mediaState];
-  }
-}
-
-// Checks if tabs (excluding selected) has media state equals to the second
-// parameter. It returns YES when it finds the first tab with the criterion.
-- (BOOL)isAnyOtherTab:(content::WebContents*)selected
-            withState:(TabMediaState)state {
-  const int existingTabCount = tabStripModel_->count();
-  for (int i = 0; i < existingTabCount; ++i) {
-    content::WebContents* currentContents = tabStripModel_->GetWebContentsAt(i);
-    if (selected == currentContents)
-      continue;
-    TabMediaState currentMediaStateForContents =
-        [self mediaStateForContents:currentContents];
-    if (currentMediaStateForContents == state)
-      return YES;
-  }
-  return NO;
-}
-
-- (TabMediaState)mediaStateForContents:(content::WebContents*)contents {
-  return chrome::GetTabMediaStateForContents(contents);
-}
-
 - (void)themeDidChangeNotification:(NSNotification*)notification {
   [self setNewTabImages];
 }
 
 - (void)setNewTabImages {
   ThemeService *theme =
       static_cast<ThemeService*>([[tabStripView_ window] themeProvider]);
   if (!theme)
     return;
 
@@ skipping 24 matching lines @@
                     forButtonState:image_button_cell::kHoverStateBackground];
   } else {
     [[newTabButton_ cell] setImage:nil
                     forButtonState:image_button_cell::kDefaultStateBackground];
     [[newTabButton_ cell] setImage:nil
                     forButtonState:image_button_cell::kHoverStateBackground];
   }
 }
 
 @end