summaryrefslogtreecommitdiffstats
path: root/chrome/browser/options_util.cc
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 13:42:27 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 13:42:27 +0000
commit6a110a9b72eabdd5ddb3057c78e5bfec44ecbe40 (patch)
treef03019faaeff06fa57a1793a13e4116fd6bff795 /chrome/browser/options_util.cc
parentcec97c9ed4174541f9cbfeeb23a22eafecd9e5af (diff)
downloadchromium_src-6a110a9b72eabdd5ddb3057c78e5bfec44ecbe40.zip
chromium_src-6a110a9b72eabdd5ddb3057c78e5bfec44ecbe40.tar.gz
chromium_src-6a110a9b72eabdd5ddb3057c78e5bfec44ecbe40.tar.bz2
Make "Reset to Defaults" reset geolocation permissions too
BUG=38626 TEST=Allow or block a site using geolocation, select Reset To Defaults, reload page. It should re-prompt. Review URL: http://codereview.chromium.org/1530014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/options_util.cc')
-rw-r--r--chrome/browser/options_util.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc
index b0573b4..1cd0759 100644
--- a/chrome/browser/options_util.cc
+++ b/chrome/browser/options_util.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
#include "chrome/browser/host_content_settings_map.h"
#include "chrome/browser/host_zoom_map.h"
#include "chrome/browser/metrics/metrics_service.h"
@@ -68,6 +69,7 @@ void OptionsUtil::ResetToDefaults(Profile* profile) {
};
profile->GetDownloadManager()->ResetAutoOpenFiles();
profile->GetHostContentSettingsMap()->ResetToDefaults();
+ profile->GetGeolocationContentSettingsMap()->ResetToDefault();
profile->GetHostZoomMap()->ResetToDefaults();
for (size_t i = 0; i < arraysize(kUserPrefs); ++i)
prefs->ClearPref(kUserPrefs[i]);