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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 1412083002: Indicate in the Window menu which Chrome window has an active sound playing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Applied some changes based on comments Created 5 years, 2 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/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..85239eb077dcc304cba4225feb80de256402c7bc 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -296,13 +296,32 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
}
void BrowserWindowCocoa::UpdateTitleBar() {
- NSString* newTitle =
- base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
+ NSString* newTitle = windowTitle();
- pending_window_title_.reset(
- [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
- withNewTitle:newTitle
- forWindow:window()]);
+ 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::windowTitle() {
+ if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) {
+ return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC,
+ browser_->GetWindowTitleForCurrentTab());
+ } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) {
+ return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC,
+ browser_->GetWindowTitleForCurrentTab());
+ }
+ return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
+}
+
+TabMediaState BrowserWindowCocoa::mediaState() {
+ return media_state_;
}
void BrowserWindowCocoa::BookmarkBarStateChanged(

Powered by Google App Engine
This is Rietveld 408576698