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

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

Issue 11896028: Add an location bar icon and a content settings bubble for media settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser test 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
195 // Sets the previous protocol handler which will be replaced by the 194 // Sets the previous protocol handler which will be replaced by the
196 // pending protocol handler. 195 // pending protocol handler.
197 void set_previous_protocol_handler(const ProtocolHandler& handler) { 196 void set_previous_protocol_handler(const ProtocolHandler& handler) {
198 previous_protocol_handler_ = handler; 197 previous_protocol_handler_ = handler;
199 } 198 }
200 199
201 const ProtocolHandler& previous_protocol_handler() const { 200 const ProtocolHandler& previous_protocol_handler() const {
202 return previous_protocol_handler_; 201 return previous_protocol_handler_;
203 } 202 }
204 203
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 void OnLocalStorageAccessed(const GURL& url, 270 void OnLocalStorageAccessed(const GURL& url,
272 bool local, 271 bool local,
273 bool blocked_by_policy); 272 bool blocked_by_policy);
274 void OnWebDatabaseAccessed(const GURL& url, 273 void OnWebDatabaseAccessed(const GURL& url,
275 const string16& name, 274 const string16& name,
276 const string16& display_name, 275 const string16& display_name,
277 bool blocked_by_policy); 276 bool blocked_by_policy);
278 void OnGeolocationPermissionSet(const GURL& requesting_frame, 277 void OnGeolocationPermissionSet(const GURL& requesting_frame,
279 bool allowed); 278 bool allowed);
280 279
280 // This method is called when a media stream is accessed.
281 void OnMediaStreamAccessed();
282
281 // Adds the given |SiteDataObserver|. The |observer| is notified when a 283 // Adds the given |SiteDataObserver|. The |observer| is notified when a
282 // locale shared object, like for example a cookie, is accessed. 284 // locale shared object, like for example a cookie, is accessed.
283 void AddSiteDataObserver(SiteDataObserver* observer); 285 void AddSiteDataObserver(SiteDataObserver* observer);
284 286
285 // Removes the given |SiteDataObserver|. 287 // Removes the given |SiteDataObserver|.
286 void RemoveSiteDataObserver(SiteDataObserver* observer); 288 void RemoveSiteDataObserver(SiteDataObserver* observer);
287 289
288 private: 290 private:
289 explicit TabSpecificContentSettings(content::WebContents* tab); 291 explicit TabSpecificContentSettings(content::WebContents* tab);
290 friend class content::WebContentsUserData<TabSpecificContentSettings>; 292 friend class content::WebContentsUserData<TabSpecificContentSettings>;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 348
347 // Stores whether the user can load blocked plugins on this page. 349 // Stores whether the user can load blocked plugins on this page.
348 bool load_plugins_link_enabled_; 350 bool load_plugins_link_enabled_;
349 351
350 content::NotificationRegistrar registrar_; 352 content::NotificationRegistrar registrar_;
351 353
352 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 354 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
353 }; 355 };
354 356
355 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 357 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698