Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: chrome/browser/ui/views/tabs/tab.h

Issue 1827083004: UI: Rename MediaState to AlertState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-tab-indicator
Patch Set: Keep gypi ordered Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/tabs/tab.h
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index 74d34307440a645c91ebeb73bf7a96a41fb40201..6b016da2278de1896aca25a73b773c8e4a08ee3f 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -23,7 +23,7 @@
#include "ui/views/masked_targeter_delegate.h"
#include "ui/views/view.h"
-class MediaIndicatorButton;
+class AlertIndicatorButton;
class TabController;
namespace gfx {
@@ -75,12 +75,12 @@ class Tab : public gfx::AnimationDelegate,
// Returns true if this tab is the active tab.
bool IsActive() const;
- // Notifies the MediaIndicatorButton that the active state of this tab has
+ // Notifies the AlertIndicatorButton that the active state of this tab has
// changed.
void ActiveStateChanged();
- // Called when the media indicator has changed states.
- void MediaStateChanged();
+ // Called when the alert indicator has changed states.
+ void AlertStateChanged();
// Returns true if the tab is selected.
bool IsSelected() const;
@@ -173,7 +173,7 @@ class Tab : public gfx::AnimationDelegate,
static float GetInverseDiagonalSlope();
private:
- friend class MediaIndicatorButtonTest;
+ friend class AlertIndicatorButtonTest;
friend class TabTest;
friend class TabStripTest;
FRIEND_TEST_ALL_PREFIXES(TabStripTest, TabHitTestMaskWhenStacked);
@@ -231,7 +231,7 @@ class Tab : public gfx::AnimationDelegate,
// ui::EventHandler:
void OnGestureEvent(ui::GestureEvent* event) override;
- // Invoked from Layout to adjust the position of the favicon or media
+ // Invoked from Layout to adjust the position of the favicon or alert
// indicator for pinned tabs.
void MaybeAdjustLeftForPinnedTab(gfx::Rect* bounds) const;
@@ -272,8 +272,8 @@ class Tab : public gfx::AnimationDelegate,
// Returns whether the Tab should display a favicon.
bool ShouldShowIcon() const;
- // Returns whether the Tab should display the media indicator.
- bool ShouldShowMediaIndicator() const;
+ // Returns whether the Tab should display the alert indicator.
+ bool ShouldShowAlertIndicator() const;
// Returns whether the Tab should display a close button.
bool ShouldShowCloseBox() const;
@@ -295,7 +295,7 @@ class Tab : public gfx::AnimationDelegate,
should_display_crashed_favicon_ = true;
}
- // Recalculates the correct |button_color_| and resets the title, media
+ // Recalculates the correct |button_color_| and resets the title, alert
// indicator, and close button colors if necessary. This should be called any
// time the theme or active state may have changed.
void OnButtonColorMaybeChanged();
@@ -356,7 +356,7 @@ class Tab : public gfx::AnimationDelegate,
scoped_refptr<gfx::AnimationContainer> animation_container_;
ThrobberView* throbber_;
- MediaIndicatorButton* media_indicator_button_;
+ AlertIndicatorButton* alert_indicator_button_;
views::ImageButton* close_button_;
views::Label* title_;
@@ -385,15 +385,15 @@ class Tab : public gfx::AnimationDelegate,
// changes and layout appropriately.
bool showing_icon_;
- // Whether we're showing the media indicator. It is cached so that we can
+ // Whether we're showing the alert indicator. It is cached so that we can
// detect when it changes and layout appropriately.
- bool showing_media_indicator_;
+ bool showing_alert_indicator_;
// Whether we are showing the close button. It is cached so that we can
// detect when it changes and layout appropriately.
bool showing_close_button_;
- // The current color of the media indicator and close button icons.
+ // The current color of the alert indicator and close button icons.
SkColor button_color_;
// As the majority of the tabs are inactive, and painting tabs is slowish,
« no previous file with comments | « chrome/browser/ui/views/tabs/media_indicator_button_unittest.cc ('k') | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698