chrome/browser/geolocation/geolocation_content_settings_map.h - Issue 7328018: Migrate default geolocation content setting to host content settings map.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/geolocation/geolocation_content_settings_map.h

Issue 7328018: Migrate default geolocation content setting to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix nits Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('k') | chrome/browser/geolocation/geolocation_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_content_settings_map.h

diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.h b/chrome/browser/geolocation/geolocation_content_settings_map.h

index 640ae965b1d05a4077f79a6c6acd22a58026655d..286e1f9abd2867016c63b604ebd8f9eede04af47 100644

--- a/chrome/browser/geolocation/geolocation_content_settings_map.h

+++ b/chrome/browser/geolocation/geolocation_content_settings_map.h

@@ -44,14 +44,6 @@ class GeolocationContentSettingsMap

static void RegisterUserPrefs(PrefService* prefs);

- // Returns the default setting.

- //

- // This should only be called on the UI thread.

- ContentSetting GetDefaultContentSetting() const;

- // Returns true if the content setting is managed (set by a policy).

- bool IsDefaultContentSettingManaged() const;

// Returns a single ContentSetting which applies to the given |requesting_url|

// when embedded in a top-level page from |embedding_url|. To determine the

// setting for a top-level page, as opposed to a frame embedded in a page,

@@ -67,11 +59,6 @@ class GeolocationContentSettingsMap

// This should only be called on the UI thread.

AllOriginsSettings GetAllOriginsSettings() const;

- // Sets the default setting.

- //

- // This should only be called on the UI thread.

- void SetDefaultContentSetting(ContentSetting setting);

// Sets the content setting for a particular (requesting origin, embedding

// origin) pair. If the embedding origin is the same as the requesting

// origin, this represents the setting used when the requesting origin is

@@ -101,9 +88,6 @@ class GeolocationContentSettingsMap

private:

friend class base::RefCountedThreadSafe<GeolocationContentSettingsMap>;

- // The default setting.

- static const ContentSetting kDefaultSetting;

// Sends a CONTENT_SETTINGS_CHANGED notification.

void NotifyObservers(const ContentSettingsDetails& details);