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/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 } | 494 } |
495 | 495 |
496 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { | 496 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { |
497 NOTIMPLEMENTED(); | 497 NOTIMPLEMENTED(); |
498 } | 498 } |
499 | 499 |
500 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, | 500 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, |
501 const GURL& url, | 501 const GURL& url, |
502 const SSLStatus& ssl, | 502 const SSLStatus& ssl, |
503 bool show_history) { | 503 bool show_history) { |
504 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history); | 504 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history, |
| 505 browser_); |
505 } | 506 } |
506 | 507 |
507 void BrowserWindowCocoa::ShowWebsiteSettings( | 508 void BrowserWindowCocoa::ShowWebsiteSettings( |
508 Profile* profile, | 509 Profile* profile, |
509 TabContentsWrapper* tab_contents_wrapper, | 510 TabContentsWrapper* tab_contents_wrapper, |
510 const GURL& url, | 511 const GURL& url, |
511 const content::SSLStatus& ssl, | 512 const content::SSLStatus& ssl, |
512 bool show_history) { | 513 bool show_history) { |
513 } | 514 } |
514 | 515 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 AvatarMenuBubbleController* menu = | 662 AvatarMenuBubbleController* menu = |
662 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 663 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
663 anchoredAt:point]; | 664 anchoredAt:point]; |
664 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 665 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
665 [menu showWindow:nil]; | 666 [menu showWindow:nil]; |
666 } | 667 } |
667 | 668 |
668 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 669 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
669 [[controller_ avatarButtonController] showAvatarBubble]; | 670 [[controller_ avatarButtonController] showAvatarBubble]; |
670 } | 671 } |
OLD | NEW |