diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 14:25:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 14:25:30 +0000 |
| commit | f5214846d509a74b9899786b648a61a67a312918 (patch) | |
| tree | d78332223aa6655367d5ea771276fea9b9b39227 /chrome/browser/geolocation | |
| parent | 04e06c5b3260d4070a42caafec38c4010f5a9543 (diff) | |
| download | chromium_src-f5214846d509a74b9899786b648a61a67a312918.zip chromium_src-f5214846d509a74b9899786b648a61a67a312918.tar.gz chromium_src-f5214846d509a74b9899786b648a61a67a312918.tar.bz2 | |
Mac: Implement geolocation exceptions dialog.
xib changes:
Content settings window: Enable & hook up "exceptions" button.
The dialog is not "live" (i.e. if it's open while settings are deleted through the bubble, the window is only updated after closing & reopening it). It's not possible to do any editing in the window, only deleting. This matches windows/linux.
http://imgur.com/q7qMK
BUG=39818
TEST=Go to a few geolocation pages, click allow/deny. Then go to content settings->locations->exceptions, the visited pages should be listed.
Review URL: http://codereview.chromium.org/1566015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rwxr-xr-x | chrome/browser/geolocation/geolocation_content_settings_map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc index 9a07651..5570801 100755 --- a/chrome/browser/geolocation/geolocation_content_settings_map.cc +++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc @@ -116,8 +116,8 @@ void GeolocationContentSettingsMap::SetContentSetting( const GURL& embedding_url, ContentSetting setting) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); - DCHECK(requesting_url.is_valid() && - (embedding_url.is_valid() || embedding_url.is_empty())); + DCHECK(requesting_url.is_valid()); + DCHECK(embedding_url.is_valid() || embedding_url.is_empty()); GURL requesting_origin(requesting_url.GetOrigin()); GURL embedding_origin(embedding_url.GetOrigin()); DCHECK(requesting_origin.is_valid() && |