Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
index 028c744d53dd56751ccc7c2e29262a534a056ffc..8913e4b048478137949e60f84d971cb6084e4f6e 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
@@ -88,6 +88,8 @@ const int kBookmarkAppBubbleViewHeight = 46; |
const int kIconPreviewTargetSize = 128; |
+const char kWhiteSpaceCharacter = ' '; |
+ |
base::string16 TrimText(NSString* controlText) { |
base::string16 text = base::SysNSStringToUTF16(controlText); |
base::TrimWhitespace(text, base::TRIM_ALL, &text); |
@@ -296,13 +298,36 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() { |
} |
void BrowserWindowCocoa::UpdateTitleBar() { |
- NSString* newTitle = |
- base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab()); |
+ NSString* newTitle = GetWindowTitle(); |
+ |
+ pending_window_title_.reset([BrowserWindowUtils |
+ scheduleReplaceOldTitle:pending_window_title_.get() |
+ withNewTitle:newTitle |
+ forWindow:window()]); |
+} |
+ |
+void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) { |
+ media_state_ = media_state; |
+ UpdateTitleBar(); |
+} |
+ |
+NSString* BrowserWindowCocoa::GetWindowTitle() { |
+ NSMutableString* newTitle = [NSMutableString |
+ stringWithString:base::SysUTF16ToNSString( |
+ browser_->GetWindowTitleForCurrentTab())]; |
+ |
+ if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) |
Robert Sesek
2015/10/28 18:45:57
nit: needs braces {} around both if and else if.
|
+ [newTitle |
+ appendFormat:@"%c%@", kWhiteSpaceCharacter, |
Robert Sesek
2015/10/28 18:45:57
… continuing comment from the GRD file. Then this
|
+ l10n_util::GetNSString(IDS_WINDOW_AUDIO_PLAYING_MAC)]; |
+ else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) |
+ [newTitle appendFormat:@"%c%@", kWhiteSpaceCharacter, |
+ l10n_util::GetNSString(IDS_WINDOW_AUDIO_MUTE_MAC)]; |
+ return newTitle; |
+} |
- pending_window_title_.reset( |
- [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get() |
- withNewTitle:newTitle |
- forWindow:window()]); |
+TabMediaState BrowserWindowCocoa::GetMediaState() { |
+ return media_state_; |
} |
void BrowserWindowCocoa::BookmarkBarStateChanged( |