| 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 } | 427 } |
| 428 | 428 |
| 429 bool BrowserWindowCocoa::IsFullscreen() const { | 429 bool BrowserWindowCocoa::IsFullscreen() const { |
| 430 return [controller_ isInAnyFullscreenMode]; | 430 return [controller_ isInAnyFullscreenMode]; |
| 431 } | 431 } |
| 432 | 432 |
| 433 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const { | 433 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const { |
| 434 return false; // Currently only called from toolkit-views website_settings. | 434 return false; // Currently only called from toolkit-views website_settings. |
| 435 } | 435 } |
| 436 | 436 |
| 437 void BrowserWindowCocoa::ShowNewBackShortcutBubble(bool forward) { | 437 void BrowserWindowCocoa::MaybeShowNewBackShortcutBubble(bool forward) { |
| 438 ExclusiveAccessController* exclusive_access_controller = | 438 [controller_ exclusiveAccessController]->MaybeShowNewBackShortcutBubble( |
| 439 [controller_ exclusiveAccessController]; | 439 forward); |
| 440 exclusive_access_controller->ShowNewBackShortcutBubble(forward); | 440 } |
| 441 |
| 442 void BrowserWindowCocoa::HideNewBackShortcutBubble() { |
| 443 [controller_ exclusiveAccessController]->HideNewBackShortcutBubble(); |
| 441 } | 444 } |
| 442 | 445 |
| 443 LocationBar* BrowserWindowCocoa::GetLocationBar() const { | 446 LocationBar* BrowserWindowCocoa::GetLocationBar() const { |
| 444 return [controller_ locationBarBridge]; | 447 return [controller_ locationBarBridge]; |
| 445 } | 448 } |
| 446 | 449 |
| 447 void BrowserWindowCocoa::SetFocusToLocationBar(bool select_all) { | 450 void BrowserWindowCocoa::SetFocusToLocationBar(bool select_all) { |
| 448 [controller_ focusLocationBar:select_all ? YES : NO]; | 451 [controller_ focusLocationBar:select_all ? YES : NO]; |
| 449 } | 452 } |
| 450 | 453 |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 844 void BrowserWindowCocoa::ShowImeWarningBubble( | 847 void BrowserWindowCocoa::ShowImeWarningBubble( |
| 845 const extensions::Extension* extension, | 848 const extensions::Extension* extension, |
| 846 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& | 849 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& |
| 847 callback) { | 850 callback) { |
| 848 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; | 851 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; |
| 849 } | 852 } |
| 850 | 853 |
| 851 void BrowserWindowCocoa::OnWindowWillClose() { | 854 void BrowserWindowCocoa::OnWindowWillClose() { |
| 852 window_closed_ = true; | 855 window_closed_ = true; |
| 853 } | 856 } |
| OLD | NEW |