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

Side by Side Diff: chrome/browser/cocoa/content_settings_dialog_controller.h

Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block. (Closed)
Patch Set: updates Created 10 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "base/cocoa_protocols_mac.h" 7 #import "base/cocoa_protocols_mac.h"
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "chrome/common/content_settings_types.h" 9 #include "chrome/common/content_settings_types.h"
10 #include "chrome/browser/pref_member.h" 10 #include "chrome/browser/pref_member.h"
11 11
12 // Index of the "enabled" and "disabled" radio group settings in all tabs except 12 // Index of the "enabled" and "disabled" radio group settings in all tabs except
13 // for the cookies tab. 13 // for the cookies tab.
14 const NSInteger kContentSettingsEnabledIndex = 0; 14 const NSInteger kContentSettingsEnabledIndex = 0;
15 const NSInteger kContentSettingsDisabledIndex = 1; 15 const NSInteger kContentSettingsDisabledIndex = 1;
16 16
17 // Indices of the various cookie settings in the cookie radio group. 17 // Indices of the various cookie settings in the cookie radio group.
18 const NSInteger kCookieEnabledIndex = 0; 18 const NSInteger kCookieEnabledIndex = 0;
19 const NSInteger kCookieAskIndex = 1; 19 const NSInteger kCookieDisabledIndex = 1;
20 const NSInteger kCookieDisabledIndex = 2;
21 20
22 // Indices of the various geolocation settings in the geolocation radio group. 21 // Indices of the various geolocation settings in the geolocation radio group.
23 const NSInteger kGeolocationEnabledIndex = 0; 22 const NSInteger kGeolocationEnabledIndex = 0;
24 const NSInteger kGeolocationAskIndex = 1; 23 const NSInteger kGeolocationAskIndex = 1;
25 const NSInteger kGeolocationDisabledIndex = 2; 24 const NSInteger kGeolocationDisabledIndex = 2;
26 25
27 // Indices of the various notifications settings in the geolocation radio group. 26 // Indices of the various notifications settings in the geolocation radio group.
28 const NSInteger kNotificationsEnabledIndex = 0; 27 const NSInteger kNotificationsEnabledIndex = 0;
29 const NSInteger kNotificationsAskIndex = 1; 28 const NSInteger kNotificationsAskIndex = 1;
30 const NSInteger kNotificationsDisabledIndex = 2; 29 const NSInteger kNotificationsDisabledIndex = 2;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 @property(assign, nonatomic) NSInteger cookieSettingIndex; 78 @property(assign, nonatomic) NSInteger cookieSettingIndex;
80 @property(assign, nonatomic) BOOL blockThirdPartyCookies; 79 @property(assign, nonatomic) BOOL blockThirdPartyCookies;
81 @property(assign, nonatomic) BOOL clearSiteDataOnExit; 80 @property(assign, nonatomic) BOOL clearSiteDataOnExit;
82 @property(assign, nonatomic) NSInteger imagesEnabledIndex; 81 @property(assign, nonatomic) NSInteger imagesEnabledIndex;
83 @property(assign, nonatomic) NSInteger javaScriptEnabledIndex; 82 @property(assign, nonatomic) NSInteger javaScriptEnabledIndex;
84 @property(assign, nonatomic) NSInteger popupsEnabledIndex; 83 @property(assign, nonatomic) NSInteger popupsEnabledIndex;
85 @property(assign, nonatomic) NSInteger pluginsEnabledIndex; 84 @property(assign, nonatomic) NSInteger pluginsEnabledIndex;
86 @property(assign, nonatomic) NSInteger geolocationSettingIndex; 85 @property(assign, nonatomic) NSInteger geolocationSettingIndex;
87 @property(assign, nonatomic) NSInteger notificationsSettingIndex; 86 @property(assign, nonatomic) NSInteger notificationsSettingIndex;
88 @end 87 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698