| Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
|
| index 4716672725e0f2aa563dc0495fa4e4c2409f1e65..33e2dd238b644d1ad27abb1845c8f3b482f5dc84 100644
|
| --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
|
| @@ -264,7 +264,6 @@ const ContentTypeToNibPath kNibPaths[] = {
|
| {CONTENT_SETTINGS_TYPE_GEOLOCATION, @"ContentBlockedGeolocation"},
|
| {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, @"ContentBlockedMixedScript"},
|
| {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, @"ContentProtocolHandlers"},
|
| - {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, @"ContentBlockedDownloads"},
|
| {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, @"ContentBlockedMIDISysEx"},
|
| };
|
|
|
| @@ -313,6 +312,9 @@ const ContentTypeToNibPath kNibPaths[] = {
|
|
|
| if (model->AsSubresourceFilterBubbleModel())
|
| nibPath = @"ContentSubresourceFilter";
|
| +
|
| + if (model->AsDownloadsBubbleModel())
|
| + nibPath = @"ContentBlockedDownloads";
|
| return nibPath;
|
| }
|
|
|
| @@ -794,7 +796,8 @@ const ContentTypeToNibPath kNibPaths[] = {
|
| [[self bubble] setArrowLocation:info_bubble::kTopRight];
|
|
|
| // Adapt window size to bottom buttons. Do this before all other layouting.
|
| - if (simple_bubble && !simple_bubble->bubble_content().manage_text.empty())
|
| + if ((simple_bubble && !simple_bubble->bubble_content().manage_text.empty()) ||
|
| + contentSettingBubbleModel_->AsDownloadsBubbleModel())
|
| [self initManageDoneButtons];
|
|
|
| [self initializeTitle];
|
|
|