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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.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, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #import "base/mac/sdk_forward_declarations.h" 10 #import "base/mac/sdk_forward_declarations.h"
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 void BrowserWindowCocoa::UpdateTitleBar() { 303 void BrowserWindowCocoa::UpdateTitleBar() {
304 NSString* newTitle = WindowTitle(); 304 NSString* newTitle = WindowTitle();
305 305
306 pending_window_title_.reset([BrowserWindowUtils 306 pending_window_title_.reset([BrowserWindowUtils
307 scheduleReplaceOldTitle:pending_window_title_.get() 307 scheduleReplaceOldTitle:pending_window_title_.get()
308 withNewTitle:newTitle 308 withNewTitle:newTitle
309 forWindow:window()]); 309 forWindow:window()]);
310 } 310 }
311 311
312 NSString* BrowserWindowCocoa::WindowTitle() { 312 NSString* BrowserWindowCocoa::WindowTitle() {
313 if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) { 313 if (alert_state_ == TabAlertState::AUDIO_PLAYING) {
314 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC, 314 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC,
315 browser_->GetWindowTitleForCurrentTab(), 315 browser_->GetWindowTitleForCurrentTab(),
316 base::SysNSStringToUTF16(@"🔊")); 316 base::SysNSStringToUTF16(@"🔊"));
317 } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) { 317 } else if (alert_state_ == TabAlertState::AUDIO_MUTING) {
318 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC, 318 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC,
319 browser_->GetWindowTitleForCurrentTab(), 319 browser_->GetWindowTitleForCurrentTab(),
320 base::SysNSStringToUTF16(@"🔇")); 320 base::SysNSStringToUTF16(@"🔇"));
321 } 321 }
322 return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab()); 322 return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab());
323 } 323 }
324 324
325 void BrowserWindowCocoa::BookmarkBarStateChanged( 325 void BrowserWindowCocoa::BookmarkBarStateChanged(
326 BookmarkBar::AnimateChangeType change_type) { 326 BookmarkBar::AnimateChangeType change_type) {
327 [[controller_ bookmarkBarController] 327 [[controller_ bookmarkBarController]
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 return gfx::Rect(); 520 return gfx::Rect();
521 NSRect tabRect = [controller_ selectedTabGrowBoxRect]; 521 NSRect tabRect = [controller_ selectedTabGrowBoxRect];
522 return gfx::Rect(NSRectToCGRect(tabRect)); 522 return gfx::Rect(NSRectToCGRect(tabRect));
523 } 523 }
524 524
525 void BrowserWindowCocoa::AddFindBar( 525 void BrowserWindowCocoa::AddFindBar(
526 FindBarCocoaController* find_bar_cocoa_controller) { 526 FindBarCocoaController* find_bar_cocoa_controller) {
527 [controller_ addFindBar:find_bar_cocoa_controller]; 527 [controller_ addFindBar:find_bar_cocoa_controller];
528 } 528 }
529 529
530 void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) { 530 void BrowserWindowCocoa::UpdateAlertState(TabAlertState alert_state) {
531 media_state_ = media_state; 531 alert_state_ = alert_state;
532 UpdateTitleBar(); 532 UpdateTitleBar();
533 } 533 }
534 534
535 void BrowserWindowCocoa::ShowUpdateChromeDialog() { 535 void BrowserWindowCocoa::ShowUpdateChromeDialog() {
536 restart_browser::RequestRestart(window()); 536 restart_browser::RequestRestart(window());
537 } 537 }
538 538
539 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, 539 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url,
540 bool already_bookmarked) { 540 bool already_bookmarked) {
541 [controller_ showBookmarkBubbleForURL:url 541 [controller_ showBookmarkBubbleForURL:url
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 843
844 void BrowserWindowCocoa::ExecuteExtensionCommand( 844 void BrowserWindowCocoa::ExecuteExtensionCommand(
845 const extensions::Extension* extension, 845 const extensions::Extension* extension,
846 const extensions::Command& command) { 846 const extensions::Command& command) {
847 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; 847 [cocoa_controller() executeExtensionCommand:extension->id() command:command];
848 } 848 }
849 849
850 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() { 850 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() {
851 return [controller_ exclusiveAccessController]; 851 return [controller_ exclusiveAccessController];
852 } 852 }
OLDNEW
« 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