| 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 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 NOTIMPLEMENTED(); | 469 NOTIMPLEMENTED(); |
| 470 } | 470 } |
| 471 | 471 |
| 472 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, | 472 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, |
| 473 const GURL& url, | 473 const GURL& url, |
| 474 const SSLStatus& ssl, | 474 const SSLStatus& ssl, |
| 475 bool show_history) { | 475 bool show_history) { |
| 476 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); | 476 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); |
| 477 } | 477 } |
| 478 | 478 |
| 479 void BrowserWindowCocoa::ShowWebsiteSettings( |
| 480 Profile* profile, |
| 481 TabContentsWrapper* tab_contents_wrapper, |
| 482 const GURL& url, |
| 483 const content::SSLStatus& ssl, |
| 484 bool show_history) { |
| 485 } |
| 486 |
| 479 void BrowserWindowCocoa::ShowAppMenu() { | 487 void BrowserWindowCocoa::ShowAppMenu() { |
| 480 // No-op. Mac doesn't support showing the menus via alt keys. | 488 // No-op. Mac doesn't support showing the menus via alt keys. |
| 481 } | 489 } |
| 482 | 490 |
| 483 bool BrowserWindowCocoa::PreHandleKeyboardEvent( | 491 bool BrowserWindowCocoa::PreHandleKeyboardEvent( |
| 484 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { | 492 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { |
| 485 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) | 493 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) |
| 486 return false; | 494 return false; |
| 487 | 495 |
| 488 int id = [BrowserWindowUtils getCommandId:event]; | 496 int id = [BrowserWindowUtils getCommandId:event]; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 AvatarMenuBubbleController* menu = | 630 AvatarMenuBubbleController* menu = |
| 623 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 631 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 624 anchoredAt:point]; | 632 anchoredAt:point]; |
| 625 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 633 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
| 626 [menu showWindow:nil]; | 634 [menu showWindow:nil]; |
| 627 } | 635 } |
| 628 | 636 |
| 629 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 637 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 630 [[controller_ avatarButtonController] showAvatarBubble]; | 638 [[controller_ avatarButtonController] showAvatarBubble]; |
| 631 } | 639 } |
| OLD | NEW |