diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 07:42:27 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 07:42:27 +0000 |
| commit | 6d90ee6282db2cb9eb657fe83b8c1e85551f902f (patch) | |
| tree | 050ad1046c85203e64679a7f99e33028335e1612 /chrome/browser/cookies_tree_model.cc | |
| parent | 84bee7eacce94576b79e295595394181a015ac8a (diff) | |
| download | chromium_src-6d90ee6282db2cb9eb657fe83b8c1e85551f902f.zip chromium_src-6d90ee6282db2cb9eb657fe83b8c1e85551f902f.tar.gz chromium_src-6d90ee6282db2cb9eb657fe83b8c1e85551f902f.tar.bz2 | |
Revert 56315 - [Gtk] Display the current content setting applying to a domain along with the domain.
This patch only affectes the gtk ui. Here is what it looks like: http://imgur.com/g6Gox
If third party cookies are blocked, a warning is shown. Next to each domain, the content setting is displayed that applies (or nothing if the default applies). When the user selects some domains and presses an button, the labels are updated accordingly.
BUG=49826
TEST=unit_tests
Review URL: http://codereview.chromium.org/3096001
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/3194004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cookies_tree_model.cc')
| -rw-r--r-- | chrome/browser/cookies_tree_model.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 5f166d5..ed17c13 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -281,31 +281,6 @@ bool CookieTreeOriginNode::CanCreateContentException() const { return !url_.SchemeIsFile(); } -std::string CookieTreeOriginNode::GetCurrentContentSettingTitle( - HostContentSettingsMap* content_settings) const { - if (!CanCreateContentException()) - return std::string(); - - ContentSettings settings = - content_settings->GetNonDefaultContentSettings(url_); - switch (settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]) { - case CONTENT_SETTING_ALLOW: - return l10n_util::GetStringUTF8(IDS_EXCEPTIONS_ALLOW_BUTTON); - case CONTENT_SETTING_BLOCK: - return l10n_util::GetStringUTF8(IDS_EXCEPTIONS_BLOCK_BUTTON); - case CONTENT_SETTING_ASK: - return l10n_util::GetStringUTF8(IDS_EXCEPTIONS_ASK_BUTTON); - case CONTENT_SETTING_SESSION_ONLY: - return l10n_util::GetStringUTF8(IDS_EXCEPTIONS_SESSION_ONLY_BUTTON); - case CONTENT_SETTING_DEFAULT: - return std::string(); - default: - NOTREACHED(); - } - - return std::string(); // not reached. -} - /////////////////////////////////////////////////////////////////////////////// // CookieTreeCookiesNode, public: |