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

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

Issue 12092045: Revert 179093 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1397/src/
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 } 184 }
185 185
186 const ProtocolHandler& pending_protocol_handler() const { 186 const ProtocolHandler& pending_protocol_handler() const {
187 return pending_protocol_handler_; 187 return pending_protocol_handler_;
188 } 188 }
189 189
190 void ClearPendingProtocolHandler() { 190 void ClearPendingProtocolHandler() {
191 pending_protocol_handler_ = ProtocolHandler::EmptyProtocolHandler(); 191 pending_protocol_handler_ = ProtocolHandler::EmptyProtocolHandler();
192 } 192 }
193 193
194
194 // Sets the previous protocol handler which will be replaced by the 195 // Sets the previous protocol handler which will be replaced by the
195 // pending protocol handler. 196 // pending protocol handler.
196 void set_previous_protocol_handler(const ProtocolHandler& handler) { 197 void set_previous_protocol_handler(const ProtocolHandler& handler) {
197 previous_protocol_handler_ = handler; 198 previous_protocol_handler_ = handler;
198 } 199 }
199 200
200 const ProtocolHandler& previous_protocol_handler() const { 201 const ProtocolHandler& previous_protocol_handler() const {
201 return previous_protocol_handler_; 202 return previous_protocol_handler_;
202 } 203 }
203 204
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 void OnLocalStorageAccessed(const GURL& url, 271 void OnLocalStorageAccessed(const GURL& url,
271 bool local, 272 bool local,
272 bool blocked_by_policy); 273 bool blocked_by_policy);
273 void OnWebDatabaseAccessed(const GURL& url, 274 void OnWebDatabaseAccessed(const GURL& url,
274 const string16& name, 275 const string16& name,
275 const string16& display_name, 276 const string16& display_name,
276 bool blocked_by_policy); 277 bool blocked_by_policy);
277 void OnGeolocationPermissionSet(const GURL& requesting_frame, 278 void OnGeolocationPermissionSet(const GURL& requesting_frame,
278 bool allowed); 279 bool allowed);
279 280
280 // This method is called when a media stream is accessed.
281 void OnMediaStreamAccessed();
282
283 // Adds the given |SiteDataObserver|. The |observer| is notified when a 281 // Adds the given |SiteDataObserver|. The |observer| is notified when a
284 // locale shared object, like for example a cookie, is accessed. 282 // locale shared object, like for example a cookie, is accessed.
285 void AddSiteDataObserver(SiteDataObserver* observer); 283 void AddSiteDataObserver(SiteDataObserver* observer);
286 284
287 // Removes the given |SiteDataObserver|. 285 // Removes the given |SiteDataObserver|.
288 void RemoveSiteDataObserver(SiteDataObserver* observer); 286 void RemoveSiteDataObserver(SiteDataObserver* observer);
289 287
290 private: 288 private:
291 explicit TabSpecificContentSettings(content::WebContents* tab); 289 explicit TabSpecificContentSettings(content::WebContents* tab);
292 friend class content::WebContentsUserData<TabSpecificContentSettings>; 290 friend class content::WebContentsUserData<TabSpecificContentSettings>;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 346
349 // Stores whether the user can load blocked plugins on this page. 347 // Stores whether the user can load blocked plugins on this page.
350 bool load_plugins_link_enabled_; 348 bool load_plugins_link_enabled_;
351 349
352 content::NotificationRegistrar registrar_; 350 content::NotificationRegistrar registrar_;
353 351
354 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 352 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
355 }; 353 };
356 354
357 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 355 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698