Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 289 | 289 |
| 290 gfx::NativeWindow BrowserWindowCocoa::GetNativeWindow() const { | 290 gfx::NativeWindow BrowserWindowCocoa::GetNativeWindow() const { |
| 291 return window(); | 291 return window(); |
| 292 } | 292 } |
| 293 | 293 |
| 294 StatusBubble* BrowserWindowCocoa::GetStatusBubble() { | 294 StatusBubble* BrowserWindowCocoa::GetStatusBubble() { |
| 295 return [controller_ statusBubble]; | 295 return [controller_ statusBubble]; |
| 296 } | 296 } |
| 297 | 297 |
| 298 void BrowserWindowCocoa::UpdateTitleBar() { | 298 void BrowserWindowCocoa::UpdateTitleBar() { |
| 299 NSString* newTitle = | 299 NSString* newTitle = WindowTitle(); |
| 300 base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab()); | |
| 301 | 300 |
| 302 pending_window_title_.reset( | 301 pending_window_title_.reset([BrowserWindowUtils |
| 303 [BrowserWindowUtils scheduleReplaceOldTitle:pending_window_title_.get() | 302 scheduleReplaceOldTitle:pending_window_title_.get() |
| 304 withNewTitle:newTitle | 303 withNewTitle:newTitle |
| 305 forWindow:window()]); | 304 forWindow:window()]); |
| 305 } | |
| 306 | |
| 307 NSString* BrowserWindowCocoa::WindowTitle() { | |
| 308 if (media_state_ == TAB_MEDIA_STATE_AUDIO_PLAYING) { | |
| 309 NSString* playing_emoji = [[NSString alloc] initWithString:@"🔊"]; | |
|
Robert Sesek
2015/11/09 23:41:25
This is leaked (alloc with no release). You can ju
| |
| 310 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC, | |
| 311 browser_->GetWindowTitleForCurrentTab(), | |
| 312 base::SysNSStringToUTF16(playing_emoji)); | |
| 313 } else if (media_state_ == TAB_MEDIA_STATE_AUDIO_MUTING) { | |
| 314 NSString* muting_emoji = [[NSString alloc] initWithString:@"🔇"]; | |
| 315 return l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC, | |
| 316 browser_->GetWindowTitleForCurrentTab(), | |
| 317 base::SysNSStringToUTF16(muting_emoji)); | |
| 318 } | |
| 319 return base::SysUTF16ToNSString(browser_->GetWindowTitleForCurrentTab()); | |
| 306 } | 320 } |
| 307 | 321 |
| 308 void BrowserWindowCocoa::BookmarkBarStateChanged( | 322 void BrowserWindowCocoa::BookmarkBarStateChanged( |
| 309 BookmarkBar::AnimateChangeType change_type) { | 323 BookmarkBar::AnimateChangeType change_type) { |
| 310 [[controller_ bookmarkBarController] | 324 [[controller_ bookmarkBarController] |
| 311 updateState:browser_->bookmark_bar_state() | 325 updateState:browser_->bookmark_bar_state() |
| 312 changeType:change_type]; | 326 changeType:change_type]; |
| 313 } | 327 } |
| 314 | 328 |
| 315 void BrowserWindowCocoa::UpdateDevTools() { | 329 void BrowserWindowCocoa::UpdateDevTools() { |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 534 return gfx::Rect(); | 548 return gfx::Rect(); |
| 535 NSRect tabRect = [controller_ selectedTabGrowBoxRect]; | 549 NSRect tabRect = [controller_ selectedTabGrowBoxRect]; |
| 536 return gfx::Rect(NSRectToCGRect(tabRect)); | 550 return gfx::Rect(NSRectToCGRect(tabRect)); |
| 537 } | 551 } |
| 538 | 552 |
| 539 void BrowserWindowCocoa::AddFindBar( | 553 void BrowserWindowCocoa::AddFindBar( |
| 540 FindBarCocoaController* find_bar_cocoa_controller) { | 554 FindBarCocoaController* find_bar_cocoa_controller) { |
| 541 [controller_ addFindBar:find_bar_cocoa_controller]; | 555 [controller_ addFindBar:find_bar_cocoa_controller]; |
| 542 } | 556 } |
| 543 | 557 |
| 558 void BrowserWindowCocoa::UpdateMediaState(TabMediaState media_state) { | |
| 559 media_state_ = media_state; | |
| 560 UpdateTitleBar(); | |
| 561 } | |
| 562 | |
| 544 void BrowserWindowCocoa::ShowUpdateChromeDialog() { | 563 void BrowserWindowCocoa::ShowUpdateChromeDialog() { |
| 545 restart_browser::RequestRestart(window()); | 564 restart_browser::RequestRestart(window()); |
| 546 } | 565 } |
| 547 | 566 |
| 548 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 567 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
| 549 bool already_bookmarked) { | 568 bool already_bookmarked) { |
| 550 [controller_ showBookmarkBubbleForURL:url | 569 [controller_ showBookmarkBubbleForURL:url |
| 551 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 570 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
| 552 } | 571 } |
| 553 | 572 |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 854 void BrowserWindowCocoa::UnhideDownloadShelf() { | 873 void BrowserWindowCocoa::UnhideDownloadShelf() { |
| 855 GetDownloadShelf()->Unhide(); | 874 GetDownloadShelf()->Unhide(); |
| 856 } | 875 } |
| 857 | 876 |
| 858 void BrowserWindowCocoa::HideDownloadShelf() { | 877 void BrowserWindowCocoa::HideDownloadShelf() { |
| 859 GetDownloadShelf()->Hide(); | 878 GetDownloadShelf()->Hide(); |
| 860 StatusBubble* statusBubble = GetStatusBubble(); | 879 StatusBubble* statusBubble = GetStatusBubble(); |
| 861 if (statusBubble) | 880 if (statusBubble) |
| 862 statusBubble->Hide(); | 881 statusBubble->Hide(); |
| 863 } | 882 } |
| OLD | NEW |