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

Unified Diff: chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa_unittest.mm

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/cocoa/tabs/alert_indicator_button_cocoa_unittest.mm
diff --git a/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm b/chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa_unittest.mm
similarity index 67%
rename from chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm
rename to chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa_unittest.mm
index 2cba5de352a2cd3d6046cdfbab3dbaa19555aff7..71a15e42e2f1633489a9a774dbb8463820e4e038 100644
--- a/chrome/browser/ui/cocoa/tabs/media_indicator_button_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa_unittest.mm
@@ -2,7 +2,7 @@
// 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/media_indicator_button_cocoa.h"
+#import "chrome/browser/ui/cocoa/tabs/alert_indicator_button_cocoa.h"
#include <string>
@@ -15,7 +15,7 @@
#include "testing/platform_test.h"
// A simple target to confirm an action was invoked.
-@interface MediaIndicatorButtonTestTarget : NSObject {
+@interface AlertIndicatorButtonTestTarget : NSObject {
@private
int count_;
}
@@ -23,7 +23,7 @@
- (void)incrementCount:(id)sender;
@end
-@implementation MediaIndicatorButtonTestTarget
+@implementation AlertIndicatorButtonTestTarget
@synthesize count = count_;
- (void)incrementCount:(id)sender {
++count_;
@@ -32,30 +32,30 @@
namespace {
-class MediaIndicatorButtonTest : public CocoaTest {
+class AlertIndicatorButtonTest : public CocoaTest {
public:
- MediaIndicatorButtonTest() {
+ AlertIndicatorButtonTest() {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
std::string("--") + switches::kEnableTabAudioMuting);
- // Create the MediaIndicatorButton and add it to a view.
- button_.reset([[MediaIndicatorButton alloc] init]);
+ // Create the AlertIndicatorButton and add it to a view.
+ button_.reset([[AlertIndicatorButton alloc] init]);
EXPECT_TRUE(button_ != nil);
[[test_window() contentView] addSubview:button_.get()];
// Initially the button is disabled and showing no indicator.
- EXPECT_EQ(TAB_MEDIA_STATE_NONE, [button_ showingMediaState]);
+ EXPECT_EQ(TabAlertState::NONE, [button_ showingAlertState]);
EXPECT_FALSE([button_ isEnabled]);
// Register target to be notified of clicks.
- base::scoped_nsobject<MediaIndicatorButtonTestTarget> clickTarget(
- [[MediaIndicatorButtonTestTarget alloc] init]);
+ base::scoped_nsobject<AlertIndicatorButtonTestTarget> clickTarget(
+ [[AlertIndicatorButtonTestTarget alloc] init]);
EXPECT_EQ(0, [clickTarget count]);
[button_ setClickTarget:clickTarget withAction:@selector(incrementCount:)];
// Transition to audio indicator mode, and expect button is enabled.
- [button_ transitionToMediaState:TAB_MEDIA_STATE_AUDIO_PLAYING];
- EXPECT_EQ(TAB_MEDIA_STATE_AUDIO_PLAYING, [button_ showingMediaState]);
+ [button_ transitionToAlertState:TabAlertState::AUDIO_PLAYING];
+ EXPECT_EQ(TabAlertState::AUDIO_PLAYING, [button_ showingAlertState]);
EXPECT_TRUE([button_ isEnabled]);
// Click, and expect one click notification.
@@ -65,8 +65,8 @@ class MediaIndicatorButtonTest : public CocoaTest {
// Transition to audio muting mode, and expect button is still enabled. A
// click should result in another click notification.
- [button_ transitionToMediaState:TAB_MEDIA_STATE_AUDIO_MUTING];
- EXPECT_EQ(TAB_MEDIA_STATE_AUDIO_MUTING, [button_ showingMediaState]);
+ [button_ transitionToAlertState:TabAlertState::AUDIO_MUTING];
+ EXPECT_EQ(TabAlertState::AUDIO_MUTING, [button_ showingAlertState]);
EXPECT_TRUE([button_ isEnabled]);
[button_ performClick:button_];
EXPECT_EQ(2, [clickTarget count]);
@@ -74,17 +74,17 @@ class MediaIndicatorButtonTest : public CocoaTest {
// Transition to capturing mode. Now, the button is disabled since it
// should only be drawing the indicator icon (i.e., there is nothing to
// mute). A click should NOT result in another click notification.
- [button_ transitionToMediaState:TAB_MEDIA_STATE_CAPTURING];
- EXPECT_EQ(TAB_MEDIA_STATE_CAPTURING, [button_ showingMediaState]);
+ [button_ transitionToAlertState:TabAlertState::TAB_CAPTURING];
+ EXPECT_EQ(TabAlertState::TAB_CAPTURING, [button_ showingAlertState]);
EXPECT_FALSE([button_ isEnabled]);
[button_ performClick:button_];
EXPECT_EQ(2, [clickTarget count]);
}
- base::scoped_nsobject<MediaIndicatorButton> button_;
+ base::scoped_nsobject<AlertIndicatorButton> button_;
base::MessageLoopForUI message_loop_; // Needed for gfx::Animation.
};
-TEST_VIEW(MediaIndicatorButtonTest, button_)
+TEST_VIEW(AlertIndicatorButtonTest, button_)
} // namespace

Powered by Google App Engine
This is Rietveld 408576698