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

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

Issue 1412803012: Revert "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: Created 5 years, 1 month 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 2e52d63b39acdabc278f307c55d8d363c2048b04..3b3606a3f97d5bcc005fc1eeb46f9a9875993329 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -297,23 +297,13 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
}
void BrowserWindowCocoa::UpdateTitleBar() {
- NSString* newTitle = WindowTitle();
+ NSString* newTitle =
+ base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
- pending_window_title_.reset([BrowserWindowUtils
- scheduleReplaceOldTitle:pending_window_title_.get()
- withNewTitle:newTitle
- forWindow:window()]);
-}
-
-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());
+ pending_window_title_.reset(
+ [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
+ withNewTitle:newTitle
+ forWindow:window()]);
}
void BrowserWindowCocoa::BookmarkBarStateChanged(
@@ -552,11 +542,6 @@ void BrowserWindowCocoa::AddFindBar(
[controller_ addFindBar:find_bar_cocoa_controller];
}
-void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) {
- media_state_ = media_state;
- UpdateTitleBar();
-}
-
void BrowserWindowCocoa::ShowUpdateChromeDialog() {
restart_browser::RequestRestart(window());
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698