Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3633)

Unified Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 2561673003: Handle per-tab AUTOMATIC_DOWNLOADS setting in DownloadRequestLimiter. (Closed)
Patch Set: Fix whitespace Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 444110b26530b3d97979bc5cb27a71346569191d..5d800cf6a9bdb92e61c74494d5f3f1ad719759b4 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
@@ -260,7 +260,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"},
};
@@ -309,6 +308,9 @@ const ContentTypeToNibPath kNibPaths[] = {
if (model->AsSubresourceFilterBubbleModel())
nibPath = @"ContentSubresourceFilter";
+
+ if (model->AsDownloadsBubbleModel())
+ nibPath = @"ContentBlockedDownloads";
return nibPath;
}
@@ -790,7 +792,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];

Powered by Google App Engine
This is Rietveld 408576698