Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.h

Issue 8612007: Add OVERRIDE to chrome/browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Maps hostnames to custom content settings. Written on the UI thread and read 5 // Maps hostnames to custom content settings. Written on the UI thread and read
6 // on any thread. One instance per profile. 6 // on any thread. One instance per profile.
7 7
8 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 8 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
9 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 9 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
10 #pragma once 10 #pragma once
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // PrefService. This methods needs to be called before destroying the Profile. 161 // PrefService. This methods needs to be called before destroying the Profile.
162 // Afterwards, none of the methods above that should only be called on the UI 162 // Afterwards, none of the methods above that should only be called on the UI
163 // thread should be called anymore. 163 // thread should be called anymore.
164 void ShutdownOnUIThread(); 164 void ShutdownOnUIThread();
165 165
166 // content_settings::Observer implementation. 166 // content_settings::Observer implementation.
167 virtual void OnContentSettingChanged( 167 virtual void OnContentSettingChanged(
168 ContentSettingsPattern primary_pattern, 168 ContentSettingsPattern primary_pattern,
169 ContentSettingsPattern secondary_pattern, 169 ContentSettingsPattern secondary_pattern,
170 ContentSettingsType content_type, 170 ContentSettingsType content_type,
171 std::string resource_identifier); 171 std::string resource_identifier) OVERRIDE;
172 172
173 // Returns true if we should allow all content types for this URL. This is 173 // Returns true if we should allow all content types for this URL. This is
174 // true for various internal objects like chrome:// URLs, so UI and other 174 // true for various internal objects like chrome:// URLs, so UI and other
175 // things users think of as "not webpages" don't break. 175 // things users think of as "not webpages" don't break.
176 static bool ShouldAllowAllContent(const GURL& primary_url, 176 static bool ShouldAllowAllContent(const GURL& primary_url,
177 const GURL& secondary_url, 177 const GURL& secondary_url,
178 ContentSettingsType content_type); 178 ContentSettingsType content_type);
179 179
180 private: 180 private:
181 friend class base::RefCountedThreadSafe<HostContentSettingsMap>; 181 friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 // Content setting providers. 222 // Content setting providers.
223 ProviderMap content_settings_providers_; 223 ProviderMap content_settings_providers_;
224 224
225 // Used around accesses to the following objects to guarantee thread safety. 225 // Used around accesses to the following objects to guarantee thread safety.
226 mutable base::Lock lock_; 226 mutable base::Lock lock_;
227 227
228 DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap); 228 DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
229 }; 229 };
230 230
231 #endif // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 231 #endif // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698