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

Unified Diff: chrome/browser/ui/cocoa/content_settings_dialog_controller.mm

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings
Patch Set: updates Created 10 years 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_dialog_controller.mm
diff --git a/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm b/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm
index 7a574d0f91851a767eb8f4ffb31e8712167a9214..855dc3a3a770b03c14119f1e8aadae1437b43dbb 100644
--- a/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/content_settings_dialog_controller.mm
@@ -9,6 +9,7 @@
#include "app/l10n_util.h"
#include "base/command_line.h"
#include "base/mac_util.h"
+#import "chrome/browser/content_settings/content_settings_details.h"
#import "chrome/browser/content_settings/host_content_settings_map.h"
#import "chrome/browser/geolocation/geolocation_content_settings_map.h"
#import "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
@@ -49,8 +50,7 @@ ContentSettingsDialogController* g_instance = nil;
- (void)prefChanged:(const std::string&)prefName;
// Callback when content settings are changed.
-- (void)contentSettingsChanged:
- (HostContentSettingsMap::ContentSettingsDetails*)details;
+- (void)contentSettingsChanged:(ContentSettingsDetails*)details;
@end
@@ -80,8 +80,8 @@ class PrefObserverBridge : public NotificationObserver {
// This is sent when the "is managed" state changes.
// TODO(markusheintz): Move all content settings to this notification.
if (type == NotificationType::CONTENT_SETTINGS_CHANGED) {
- HostContentSettingsMap::ContentSettingsDetails* settings_details =
- Details<HostContentSettingsMap::ContentSettingsDetails>(details).ptr();
+ ContentSettingsDetails* settings_details =
+ Details<ContentSettingsDetails>(details).ptr();
[controller_ contentSettingsChanged:settings_details];
}
}
@@ -638,8 +638,7 @@ class PrefObserverDisabler {
}
}
-- (void)contentSettingsChanged:
- (HostContentSettingsMap::ContentSettingsDetails*)details {
+- (void)contentSettingsChanged:(ContentSettingsDetails*)details {
[self prefChanged:prefs::kBlockNonsandboxedPlugins];
[self prefChanged:prefs::kDefaultContentSettings];
}

Powered by Google App Engine
This is Rietveld 408576698