summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_exceptions_table_model.cc
Commit message (Collapse)AuthorAgeFilesLines
* Convert all exception patterns into punicode. Current matcher uses punicode ↵cira@google.com2010-10-151-2/+8
| | | | | | | | | | | | | | | entered in the omnibox and utf8 entered in the exception dialog, and they match only for ASCII urls. This change will show punicode patterns to the user in the exception dialog. We already have that behavior if user uses Omnibox UI to specify the pattern. This CL doesn't solve the UI issue crbug.com/52629 as it still shows punycode representation of the pattern to the user. BUG=38317,52629 TEST=Open exception/images dialog, and add non-ascii pattern as an exception. Try going to that url. You should see the images on the page, and pattern you entered will be displayed as punicode in the exception dialog. Review URL: http://codereview.chromium.org/3087015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62784 0039d316-1c4b-4281-b951-d872f2087c98
* Change plugin content settings to three states: Allow, click-to-play, and block.bauerb@chromium.org2010-10-111-0/+2
| | | | | | | | | | | | | The click-to-play default setting says "Let me choose which plug-ins to run". XIB changes: Change the middle radio button label in plug-in default settings from IDS_PLUGINS_LOAD_SANDBOXED_RADIO to IDS_PLUGINS_ASK_RADIO. BUG=35316,56514,56270 TEST=ContentSettingsBubbleModelTest.*, mainly Review URL: http://codereview.chromium.org/3608007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62146 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Small nits; moving virtual methods to implementation.erg@google.com2010-10-081-0/+2
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3627002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61976 0039d316-1c4b-4281-b951-d872f2087c98
* Remove vestigial cookie/web app permissions prompting UI now that the async ↵ben@chromium.org2010-09-171-2/+0
| | | | | | | | | | UI has been approved for M7.This allows me to more easily change the way the appmodal dialog system works. http://crbug.com/55121 TEST=existing tests Review URL: http://codereview.chromium.org/3299020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59838 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce a resource identifier for content settings.jochen@chromium.org2010-08-061-5/+11
| | | | | | | | | | | This will allow for having per plugin content settings, i.e. the content settings type would be plugin and the resource identifier would be to concrete plugin that is about to be loaded. BUG=39252 TEST=unit_tests Review URL: http://codereview.chromium.org/2878075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55213 0039d316-1c4b-4281-b951-d872f2087c98
* Command line flag to disable the cookie prompt.jochen@chromium.org2010-07-301-0/+2
| | | | | | | | | | | | | The XIB change re-introduces the cookie tab view item with the "ask" setting as additinoal tab view item. The controller deletes the one not required according to the command line flag. BUG=50083 TEST=none Review URL: http://codereview.chromium.org/3075013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54308 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the cookie prompt from the settings UI and migrate prefs from ask to ↵jochen@chromium.org2010-07-141-2/+0
| | | | | | | | | | | 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
* Add a "session only" policy to the content settings.jochen@chromium.org2010-07-021-0/+2
| | | | | | | | | | | session only is treated as allow, but the cookies will expire after this session (the actual code to expire non-html cookies will follow). BUG=47049 TEST=none Review URL: http://codereview.chromium.org/2858018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51522 0039d316-1c4b-4281-b951-d872f2087c98
* Display content settings applying to the current otr session only.jochen@chromium.org2010-07-021-13/+38
| | | | | | | | | | | | | Also allow for editing them... The XIB change adds a column at the end of the table with a NSCheckboxCell in it and the title IDS_EXCEPTIONS_OTR_HEADER BUG=44480 TEST=manual Review URL: http://codereview.chromium.org/2858032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51507 0039d316-1c4b-4281-b951-d872f2087c98
* Implement patterns for content setting exceptions.jochen@chromium.org2010-04-081-11/+13
| | | | | | | | | BUG=37394 TEST=unit_tests + manual Review URL: http://codereview.chromium.org/1567010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43936 0039d316-1c4b-4281-b951-d872f2087c98
* chrome 1: string_util.h -> utf_string_conversions.h fix.jhawkins@chromium.org2010-03-081-0/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/672001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40937 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Content Settings Exceptions dialog.thakis@chromium.org2010-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | xib changes: ContentSettings.xib: Connect the various "Exceptions" buttons to their handlers and enable them. ContentBlocked*.xib: Now that exceptions can be edited, enable the radio buttons. ContentExceptionsWindow.xib: Add a xib with an exceptions window. Screenshot: http://imgur.com/fLwKA Screenshot on windows: http://imgur.com/UltQp Adding and editing exceptions doesn't work yet. I'll probably do this inline like in the bookmarks manager instead of with a sheet. BUG=34894 TEST=prefs->content settings->exceptions. if you set e.g. the cookie setting to "ask" and then say "remember" in the cookie dialog, these exceptions should show up in the cookie exceptions list. Likewise, if you use the radio group in the popup blocker bubble to override the blocking setting, that should show up there too. Also test this: 1.) Set cookie settings for www.tagesschau.de to "ask", leave window open 2.) Go to tagesschau.de 3.) In dialog, say "remember" and "block" 4.) in exceptions window, the setting should now say "block". Check that all buttons work as expected. Return should enter renaming mode for the current line, esc should stop editing, delete should delete the current line. Review URL: http://codereview.chromium.org/660150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40156 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Implement the exceptions dialog for the content filtering settings.erg@chromium.org2010-02-191-0/+89
BUG=35178 TEST=none Review URL: http://codereview.chromium.org/646060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39468 0039d316-1c4b-4281-b951-d872f2087c98