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

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

Issue 1417033010: Adding <keygen> Content Setting (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_core
Patch Set: Rebase. Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 void OnLocalStorageAccessed(const GURL& url, 329 void OnLocalStorageAccessed(const GURL& url,
330 bool local, 330 bool local,
331 bool blocked_by_policy); 331 bool blocked_by_policy);
332 void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy); 332 void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy);
333 void OnWebDatabaseAccessed(const GURL& url, 333 void OnWebDatabaseAccessed(const GURL& url,
334 const base::string16& name, 334 const base::string16& name,
335 const base::string16& display_name, 335 const base::string16& display_name,
336 bool blocked_by_policy); 336 bool blocked_by_policy);
337 void OnGeolocationPermissionSet(const GURL& requesting_frame, 337 void OnGeolocationPermissionSet(const GURL& requesting_frame,
338 bool allowed); 338 bool allowed);
339 void OnDidUseKeygen(const GURL& url);
339 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 340 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
340 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame, 341 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame,
341 bool allowed); 342 bool allowed);
342 #endif 343 #endif
343 344
344 // This method is called to update the status about the microphone and 345 // This method is called to update the status about the microphone and
345 // camera stream access. 346 // camera stream access.
346 void OnMediaStreamPermissionSet( 347 void OnMediaStreamPermissionSet(
347 const GURL& request_origin, 348 const GURL& request_origin,
348 MicrophoneCameraState new_microphone_camera_state, 349 MicrophoneCameraState new_microphone_camera_state,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 std::string media_stream_requested_audio_device_; 467 std::string media_stream_requested_audio_device_;
467 std::string media_stream_requested_video_device_; 468 std::string media_stream_requested_video_device_;
468 469
469 // Observer to watch for content settings changed. 470 // Observer to watch for content settings changed.
470 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 471 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
471 472
472 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 473 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
473 }; 474 };
474 475
475 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 476 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698