diff options
Diffstat (limited to 'chrome/browser/cocoa')
4 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm index 9fa9d0e..e18370f 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm +++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm @@ -178,10 +178,9 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { const ContentSettingBubbleModel::RadioGroup& radioGroup = contentSettingBubbleModel_->bubble_content().radio_group; - // Initialize radio group state. + // Select appropriate radio button. [allowBlockRadioGroup_ selectCellWithTag: radioGroup.default_item == 0 ? kAllowTag : kBlockTag]; - [allowBlockRadioGroup_ setEnabled:radioGroup.is_mutable]; // Copy |host_| into radio group label. NSCell* radioCell = [allowBlockRadioGroup_ cellWithTag:kAllowTag]; diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm b/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm index 57f91ff..a7b940e 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm @@ -21,7 +21,6 @@ class DummyContentSettingBubbleModel : public ContentSettingBubbleModel { RadioGroup radio_group; radio_group.default_item = 0; radio_group.radio_items.resize(2); - radio_group.is_mutable = true; set_radio_group(radio_group); } }; diff --git a/chrome/browser/cocoa/cookie_prompt_window_controller.h b/chrome/browser/cocoa/cookie_prompt_window_controller.h index 3f440db..6ae68b4 100644 --- a/chrome/browser/cocoa/cookie_prompt_window_controller.h +++ b/chrome/browser/cocoa/cookie_prompt_window_controller.h @@ -39,7 +39,6 @@ class CookieTreeNode; IBOutlet NSView* disclosureButtonSuperView_; IBOutlet NSMatrix* radioGroupMatrix_; IBOutlet NSButtonCell* rememberChoiceCell_; - IBOutlet NSButtonCell* askChoiceCell_; } // Designated initializer. diff --git a/chrome/browser/cocoa/cookie_prompt_window_controller.mm b/chrome/browser/cocoa/cookie_prompt_window_controller.mm index 1d53508b..84aa661 100644 --- a/chrome/browser/cocoa/cookie_prompt_window_controller.mm +++ b/chrome/browser/cocoa/cookie_prompt_window_controller.mm @@ -137,10 +137,6 @@ static const CGFloat kExtraMarginForDetailsView = 10; [self doLayoutTweaks]; [self replaceCookieDetailsView]; - bool rememberEnabled = dialog_->DecisionPersistable(); - [radioGroupMatrix_ setEnabled:rememberEnabled]; - [radioGroupMatrix_ selectCell:( - rememberEnabled ? rememberChoiceCell_ : askChoiceCell_)]; [[detailsViewController_ view] setHidden:YES]; } |