diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 08:15:48 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 08:15:48 +0000 |
commit | eee3452dafdca8a97fa73ea466b6621dcff77238 (patch) | |
tree | e60c0062aa9768c4314c42f85ec42aedafbc04a9 /chrome/browser/content_setting_combo_model.h | |
parent | fec862637c99eff80e18a8769c0900f65d9d2d27 (diff) | |
download | chromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.zip chromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.tar.gz chromium_src-eee3452dafdca8a97fa73ea466b6621dcff77238.tar.bz2 |
Remove the cookie prompt from the settings UI and migrate prefs from ask to block.
BUG=48941
TEST=none
Review URL: http://codereview.chromium.org/2963006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_setting_combo_model.h')
-rw-r--r-- | chrome/browser/content_setting_combo_model.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/content_setting_combo_model.h index 751e9d0..255f02a 100644 --- a/chrome/browser/content_setting_combo_model.h +++ b/chrome/browser/content_setting_combo_model.h @@ -12,7 +12,7 @@ class ContentSettingComboModel : public ComboboxModel { public: - explicit ContentSettingComboModel(bool show_ask); + explicit ContentSettingComboModel(bool show_session); virtual ~ContentSettingComboModel(); virtual int GetItemCount(); @@ -24,7 +24,7 @@ class ContentSettingComboModel : public ComboboxModel { int IndexForSetting(ContentSetting); private: - const bool show_ask_; + const bool show_session_; DISALLOW_COPY_AND_ASSIGN(ContentSettingComboModel); }; |