| 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 #import "chrome/browser/app_controller_mac.h" | 5 #import "chrome/browser/app_controller_mac.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 961 break; | 961 break; |
| 962 } | 962 } |
| 963 SigninManager* signin = SigninManagerFactory::GetForProfile( | 963 SigninManager* signin = SigninManagerFactory::GetForProfile( |
| 964 lastProfile->GetOriginalProfile()); | 964 lastProfile->GetOriginalProfile()); |
| 965 enable = signin->IsSigninAllowed() && ![self keyWindowIsModal]; | 965 enable = signin->IsSigninAllowed() && ![self keyWindowIsModal]; |
| 966 [AppController updateSigninItem:item | 966 [AppController updateSigninItem:item |
| 967 shouldShow:enable | 967 shouldShow:enable |
| 968 currentProfile:lastProfile]; | 968 currentProfile:lastProfile]; |
| 969 break; | 969 break; |
| 970 } | 970 } |
| 971 #if defined(GOOGLE_CHROME_BUILD) | |
| 972 case IDC_FEEDBACK: | |
| 973 enable = NO; | |
| 974 break; | |
| 975 #endif | |
| 976 default: | 971 default: |
| 977 enable = menuState_->IsCommandEnabled(tag) ? | 972 enable = menuState_->IsCommandEnabled(tag) ? |
| 978 ![self keyWindowIsModal] : NO; | 973 ![self keyWindowIsModal] : NO; |
| 979 } | 974 } |
| 980 } | 975 } |
| 981 | 976 |
| 982 // "Show as tab" should only appear when the current window is a popup. | 977 // "Show as tab" should only appear when the current window is a popup. |
| 983 // Since |validateUserInterfaceItem:| is called only when there are no | 978 // Since |validateUserInterfaceItem:| is called only when there are no |
| 984 // key windows, we should just hide this. | 979 // key windows, we should just hide this. |
| 985 // This is handled outside of the switch statement because we want to hide | 980 // This is handled outside of the switch statement because we want to hide |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1694 | 1689 |
| 1695 //--------------------------------------------------------------------------- | 1690 //--------------------------------------------------------------------------- |
| 1696 | 1691 |
| 1697 namespace app_controller_mac { | 1692 namespace app_controller_mac { |
| 1698 | 1693 |
| 1699 bool IsOpeningNewWindow() { | 1694 bool IsOpeningNewWindow() { |
| 1700 return g_is_opening_new_window; | 1695 return g_is_opening_new_window; |
| 1701 } | 1696 } |
| 1702 | 1697 |
| 1703 } // namespace app_controller_mac | 1698 } // namespace app_controller_mac |
| OLD | NEW |