| 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 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 842 return [controller_ window]; | 842 return [controller_ window]; |
| 843 } | 843 } |
| 844 | 844 |
| 845 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton( | 845 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton( |
| 846 AvatarBubbleMode mode, | 846 AvatarBubbleMode mode, |
| 847 const signin::ManageAccountsParams& manage_accounts_params, | 847 const signin::ManageAccountsParams& manage_accounts_params, |
| 848 signin_metrics::AccessPoint access_point) { | 848 signin_metrics::AccessPoint access_point) { |
| 849 AvatarBaseController* controller = [controller_ avatarButtonController]; | 849 AvatarBaseController* controller = [controller_ avatarButtonController]; |
| 850 NSView* anchor = [controller buttonView]; | 850 NSView* anchor = [controller buttonView]; |
| 851 if ([anchor isHiddenOrHasHiddenAncestor]) | 851 if ([anchor isHiddenOrHasHiddenAncestor]) |
| 852 anchor = [[controller_ toolbarController] wrenchButton]; | 852 anchor = [[controller_ toolbarController] appMenuButton]; |
| 853 [controller showAvatarBubbleAnchoredAt:anchor | 853 [controller showAvatarBubbleAnchoredAt:anchor |
| 854 withMode:mode | 854 withMode:mode |
| 855 withServiceType:manage_accounts_params.service_type | 855 withServiceType:manage_accounts_params.service_type |
| 856 fromAccessPoint:access_point]; | 856 fromAccessPoint:access_point]; |
| 857 } | 857 } |
| 858 | 858 |
| 859 void BrowserWindowCocoa::ShowModalSigninWindow( | 859 void BrowserWindowCocoa::ShowModalSigninWindow( |
| 860 AvatarBubbleMode mode, | 860 AvatarBubbleMode mode, |
| 861 signin_metrics::AccessPoint access_point) { | 861 signin_metrics::AccessPoint access_point) { |
| 862 NOTREACHED(); | 862 NOTREACHED(); |
| (...skipping 30 matching lines...) Expand all Loading... |
| 893 void BrowserWindowCocoa::UnhideDownloadShelf() { | 893 void BrowserWindowCocoa::UnhideDownloadShelf() { |
| 894 GetDownloadShelf()->Unhide(); | 894 GetDownloadShelf()->Unhide(); |
| 895 } | 895 } |
| 896 | 896 |
| 897 void BrowserWindowCocoa::HideDownloadShelf() { | 897 void BrowserWindowCocoa::HideDownloadShelf() { |
| 898 GetDownloadShelf()->Hide(); | 898 GetDownloadShelf()->Hide(); |
| 899 StatusBubble* statusBubble = GetStatusBubble(); | 899 StatusBubble* statusBubble = GetStatusBubble(); |
| 900 if (statusBubble) | 900 if (statusBubble) |
| 901 statusBubble->Hide(); | 901 statusBubble->Hide(); |
| 902 } | 902 } |
| OLD | NEW |