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 bool BrowserWindowCocoa::IsFullscreen() const { | 428 bool BrowserWindowCocoa::IsFullscreen() const { |
429 return [controller_ isInAnyFullscreenMode]; | 429 return [controller_ isInAnyFullscreenMode]; |
430 } | 430 } |
431 | 431 |
432 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const { | 432 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const { |
433 return false; // Currently only called from toolkit-views website_settings. | 433 return false; // Currently only called from toolkit-views website_settings. |
434 } | 434 } |
435 | 435 |
436 void BrowserWindowCocoa::ShowNewBackShortcutBubble(bool forward) { | 436 void BrowserWindowCocoa::ShowNewBackShortcutBubble(bool forward) { |
437 // TODO(mgiuca): Implement new back shortcut bubble Mac. | 437 ExclusiveAccessController* exclusive_access_controller = |
438 // https://crbug.com/610039. | 438 [controller_ exclusiveAccessController]; |
| 439 exclusive_access_controller->ShowNewBackShortcutBubble(forward); |
439 } | 440 } |
440 | 441 |
441 LocationBar* BrowserWindowCocoa::GetLocationBar() const { | 442 LocationBar* BrowserWindowCocoa::GetLocationBar() const { |
442 return [controller_ locationBarBridge]; | 443 return [controller_ locationBarBridge]; |
443 } | 444 } |
444 | 445 |
445 void BrowserWindowCocoa::SetFocusToLocationBar(bool select_all) { | 446 void BrowserWindowCocoa::SetFocusToLocationBar(bool select_all) { |
446 [controller_ focusLocationBar:select_all ? YES : NO]; | 447 [controller_ focusLocationBar:select_all ? YES : NO]; |
447 } | 448 } |
448 | 449 |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
833 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() { | 834 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() { |
834 return [controller_ exclusiveAccessController]; | 835 return [controller_ exclusiveAccessController]; |
835 } | 836 } |
836 | 837 |
837 void BrowserWindowCocoa::ShowImeWarningBubble( | 838 void BrowserWindowCocoa::ShowImeWarningBubble( |
838 const extensions::Extension* extension, | 839 const extensions::Extension* extension, |
839 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& | 840 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& |
840 callback) { | 841 callback) { |
841 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; | 842 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; |
842 } | 843 } |
OLD | NEW |