Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/translate/before_translate_infobar_controller. h" | 5 #include "chrome/browser/ui/cocoa/translate/before_translate_infobar_controller. h" |
| 6 | 6 |
| 7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
| 8 #include "grit/generated_resources.h" | 8 #include "grit/generated_resources.h" |
| 9 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
| 10 | 10 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 [visibleControls addObject:neverTranslateButton_.get()]; | 99 [visibleControls addObject:neverTranslateButton_.get()]; |
| 100 | 100 |
| 101 if ([self delegate]->ShouldShowAlwaysTranslateButton()) | 101 if ([self delegate]->ShouldShowAlwaysTranslateButton()) |
| 102 [visibleControls addObject:alwaysTranslateButton_.get()]; | 102 [visibleControls addObject:alwaysTranslateButton_.get()]; |
| 103 | 103 |
| 104 return visibleControls; | 104 return visibleControls; |
| 105 } | 105 } |
| 106 | 106 |
| 107 // This is called when the "Never Translate [language]" button is pressed. | 107 // This is called when the "Never Translate [language]" button is pressed. |
| 108 - (void)neverTranslate:(id)sender { | 108 - (void)neverTranslate:(id)sender { |
| 109 TranslateInfoBarDelegate* delegate = [self delegate]; | 109 if (![self owned]) |
| 110 if (delegate) | 110 return; // We're closing; don't call anything, it might access the owner. |
|
Robert Sesek
2011/09/22 16:49:56
I'm not sure this copy-pasted comment is really ne
Peter Kasting
2011/09/22 21:55:25
It does seem redundant, but OTOH, I really don't w
Robert Sesek
2011/09/24 19:20:16
How about adding something like it to the declarat
Peter Kasting
2011/09/26 22:34:49
Done.
| |
| 111 [self delegate]->NeverTranslatePageLanguage(); | 111 [self delegate]->NeverTranslatePageLanguage(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 // This is called when the "Always Translate [language]" button is pressed. | 114 // This is called when the "Always Translate [language]" button is pressed. |
| 115 - (void)alwaysTranslate:(id)sender { | 115 - (void)alwaysTranslate:(id)sender { |
| 116 TranslateInfoBarDelegate* delegate = [self delegate]; | 116 if (![self owned]) |
| 117 if (delegate) | 117 return; // We're closing; don't call anything, it might access the owner. |
| 118 delegate->AlwaysTranslatePageLanguage(); | 118 [self delegate]->AlwaysTranslatePageLanguage(); |
| 119 } | 119 } |
| 120 | 120 |
| 121 - (bool)verifyLayout { | 121 - (bool)verifyLayout { |
| 122 if ([optionsPopUp_ isHidden]) | 122 if ([optionsPopUp_ isHidden]) |
| 123 return false; | 123 return false; |
| 124 return [super verifyLayout]; | 124 return [super verifyLayout]; |
| 125 } | 125 } |
| 126 | 126 |
| 127 @end | 127 @end |
| 128 | 128 |
| 129 @implementation BeforeTranslateInfobarController (TestingAPI) | 129 @implementation BeforeTranslateInfobarController (TestingAPI) |
| 130 | 130 |
| 131 - (NSButton*)alwaysTranslateButton { | 131 - (NSButton*)alwaysTranslateButton { |
| 132 return alwaysTranslateButton_.get(); | 132 return alwaysTranslateButton_.get(); |
| 133 } | 133 } |
| 134 - (NSButton*)neverTranslateButton { | 134 - (NSButton*)neverTranslateButton { |
| 135 return neverTranslateButton_.get(); | 135 return neverTranslateButton_.get(); |
| 136 } | 136 } |
| 137 | 137 |
| 138 @end | 138 @end |
| OLD | NEW |