UI: Rename MediaState to AlertState

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 16 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/drag_util.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
-#import "chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa.h"
+#import "chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #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"
@@ skipping 115 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;
 - (BOOL)doesAnyOtherWebContents:(content::WebContents*)selected
-                 haveMediaState:(TabMediaState)state;
+                 haveAlertState:(TabAlertState)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 594 matching lines @@
 }
 
 // Called when the user clicks the tab audio indicator to mute the tab.
 - (void)toggleMute:(id)sender {
   DCHECK([sender isKindOfClass:[TabView class]]);
   NSInteger index = [self modelIndexForTabView:sender];
   if (!tabStripModel_->ContainsIndex(index))
     return;
   WebContents* contents = tabStripModel_->GetWebContentsAt(index);
   chrome::SetTabAudioMuted(contents, !contents->IsAudioMuted(),
-                           TAB_MUTED_REASON_AUDIO_INDICATOR, std::string());
+                           TabMutedReason::AUDIO_INDICATOR, std::string());
 }
 
 // Called when the user closes a tab. Asks the model to close the tab. |sender|
 // is the TabView that is potentially going away.
 - (void)closeTab:(id)sender {
   DCHECK([sender isKindOfClass:[TabView class]]);
 
   // Cancel any pending tab transition.
   hoverTabSelector_->CancelTabTransition();
 
@@ skipping 416 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, [self alertStateForContents: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 329 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 forWebContents:contents];
-  [tabController setMediaState:mediaState];
+  TabAlertState alertState = [self alertStateForContents:contents];
+  [self updateWindowAlertState:alertState forWebContents:contents];
+  [tabController setAlertState:alertState];
 
   [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
+// Gets the tab and the alert state to check whether the window
+// alert state should be updated or not. If the tab alert state is
+// AUDIO_PLAYING, the window alert state should be set to AUDIO_PLAYING.
+// If the tab alert 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,
+// alert state will be set to AUDIO_MUTING. If the tab alert 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
+// alert state will be set as NONE.
+- (void)updateWindowAlertState:(TabAlertState)alertState
                 forWebContents:(content::WebContents*)selected {
   NSWindow* window = [tabStripView_ window];
   BrowserWindowController* windowController =
       [BrowserWindowController browserWindowControllerForWindow:window];
-  if (mediaState == TAB_MEDIA_STATE_NONE) {
+  if (alertState == TabAlertState::NONE) {
     if (![self doesAnyOtherWebContents:selected
-                        haveMediaState:TAB_MEDIA_STATE_AUDIO_PLAYING] &&
+                        haveAlertState:TabAlertState::AUDIO_PLAYING] &&
         ![self doesAnyOtherWebContents:selected
-                        haveMediaState:TAB_MEDIA_STATE_AUDIO_MUTING]) {
-      [windowController setMediaState:TAB_MEDIA_STATE_NONE];
+                        haveAlertState:TabAlertState::AUDIO_MUTING]) {
+      [windowController setAlertState:TabAlertState::NONE];
     } else if ([self doesAnyOtherWebContents:selected
-                              haveMediaState:TAB_MEDIA_STATE_AUDIO_MUTING]) {
-      [windowController setMediaState:TAB_MEDIA_STATE_AUDIO_MUTING];
+                              haveAlertState:TabAlertState::AUDIO_MUTING]) {
+      [windowController setAlertState:TabAlertState::AUDIO_MUTING];
     }
-  } else if (mediaState == TAB_MEDIA_STATE_AUDIO_MUTING) {
+  } else if (alertState == TabAlertState::AUDIO_MUTING) {
     if (![self doesAnyOtherWebContents:selected
-                        haveMediaState:TAB_MEDIA_STATE_AUDIO_PLAYING]) {
-      [windowController setMediaState:TAB_MEDIA_STATE_AUDIO_MUTING];
+                        haveAlertState:TabAlertState::AUDIO_PLAYING]) {
+      [windowController setAlertState:TabAlertState::AUDIO_MUTING];
     }
   } else {
-    [windowController setMediaState:mediaState];
+    [windowController setAlertState:alertState];
   }
 }
 
-// Checks if tabs (excluding selected) has media state equals to the second
+// Checks if tabs (excluding selected) has alert state equals to the second
 // parameter. It returns YES when it finds the first tab with the criterion.
 - (BOOL)doesAnyOtherWebContents:(content::WebContents*)selected
-                 haveMediaState:(TabMediaState)state {
+                 haveAlertState:(TabAlertState)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)
+    TabAlertState currentAlertStateForContents =
+        [self alertStateForContents:currentContents];
+    if (currentAlertStateForContents == state)
       return YES;
   }
   return NO;
 }
 
-- (TabMediaState)mediaStateForContents:(content::WebContents*)contents {
-  return chrome::GetTabMediaStateForContents(contents);
+- (TabAlertState)alertStateForContents:(content::WebContents*)contents {
+  return chrome::GetTabAlertStateForContents(contents);
 }
 
 - (void)themeDidChangeNotification:(NSNotification*)notification {
   [newTabButton_ setImages];
 }
 
 @end