| 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 | 480 |
| 481 int BrowserWindowCocoa::GetExtraRenderViewHeight() const { | 481 int BrowserWindowCocoa::GetExtraRenderViewHeight() const { |
| 482 // Currently this is only used on linux. | 482 // Currently this is only used on linux. |
| 483 return 0; | 483 return 0; |
| 484 } | 484 } |
| 485 | 485 |
| 486 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { | 486 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { |
| 487 NOTIMPLEMENTED(); | 487 NOTIMPLEMENTED(); |
| 488 } | 488 } |
| 489 | 489 |
| 490 void BrowserWindowCocoa::ShowPageInfo(Profile* profile, | 490 void BrowserWindowCocoa::ShowPageInfo(WebContents* web_contents, |
| 491 const GURL& url, | 491 const GURL& url, |
| 492 const SSLStatus& ssl, | 492 const SSLStatus& ssl, |
| 493 bool show_history) { | 493 bool show_history) { |
| 494 browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history, | 494 browser::ShowPageInfoBubble(window(), web_contents, url, ssl, show_history, |
| 495 browser_); | 495 browser_); |
| 496 } | 496 } |
| 497 | 497 |
| 498 void BrowserWindowCocoa::ShowWebsiteSettings( | 498 void BrowserWindowCocoa::ShowWebsiteSettings( |
| 499 Profile* profile, | 499 Profile* profile, |
| 500 TabContents* tab_contents, | 500 TabContents* tab_contents, |
| 501 const GURL& url, | 501 const GURL& url, |
| 502 const content::SSLStatus& ssl, | 502 const content::SSLStatus& ssl, |
| 503 bool show_history) { | 503 bool show_history) { |
| 504 } | 504 } |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 AvatarMenuBubbleController* menu = | 652 AvatarMenuBubbleController* menu = |
| 653 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 653 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 654 anchoredAt:point]; | 654 anchoredAt:point]; |
| 655 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 655 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
| 656 [menu showWindow:nil]; | 656 [menu showWindow:nil]; |
| 657 } | 657 } |
| 658 | 658 |
| 659 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 659 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 660 [[controller_ avatarButtonController] showAvatarBubble]; | 660 [[controller_ avatarButtonController] showAvatarBubble]; |
| 661 } | 661 } |
| OLD | NEW |