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

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

Issue 1432803002: Removed emojis from generated_resources.grd and update the code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent leaking strings in the unit test 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 028c744d53dd56751ccc7c2e29262a534a056ffc..e44f2d79ab7514efa8c4fe218d8612beec037333 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -296,13 +296,25 @@ StatusBubble* BrowserWindowCocoa::GetStatusBubble() {
}
void BrowserWindowCocoa::UpdateTitleBar() {
- NSString* newTitle =
- base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
-
- pending_window_title_.reset(
- [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get()
- withNewTitle:newTitle
- forWindow:window()]);
+ NSString* newTitle = WindowTitle();
+
+ 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(),
+ base::SysNSStringToUTF16(@"🔊"));
+ } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) {
+ return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC,
+ browser_->GetWindowTitleForCurrentTab(),
+ base::SysNSStringToUTF16(@"🔇"));
+ }
+ return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
}
void BrowserWindowCocoa::BookmarkBarStateChanged(
@@ -541,6 +553,11 @@ 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