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

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: Simplifying messages. Created 5 years 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
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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 void OnLocalStorageAccessed(const GURL& url, 326 void OnLocalStorageAccessed(const GURL& url,
327 bool local, 327 bool local,
328 bool blocked_by_policy); 328 bool blocked_by_policy);
329 void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy); 329 void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy);
330 void OnWebDatabaseAccessed(const GURL& url, 330 void OnWebDatabaseAccessed(const GURL& url,
331 const base::string16& name, 331 const base::string16& name,
332 const base::string16& display_name, 332 const base::string16& display_name,
333 bool blocked_by_policy); 333 bool blocked_by_policy);
334 void OnGeolocationPermissionSet(const GURL& requesting_frame, 334 void OnGeolocationPermissionSet(const GURL& requesting_frame,
335 bool allowed); 335 bool allowed);
336 void OnDidUseKeygen();
336 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 337 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
337 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame, 338 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame,
338 bool allowed); 339 bool allowed);
339 #endif 340 #endif
340 341
341 // This method is called to update the status about the microphone and 342 // This method is called to update the status about the microphone and
342 // camera stream access. 343 // camera stream access.
343 void OnMediaStreamPermissionSet( 344 void OnMediaStreamPermissionSet(
344 const GURL& request_origin, 345 const GURL& request_origin,
345 MicrophoneCameraState new_microphone_camera_state, 346 MicrophoneCameraState new_microphone_camera_state,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 std::string media_stream_requested_audio_device_; 464 std::string media_stream_requested_audio_device_;
464 std::string media_stream_requested_video_device_; 465 std::string media_stream_requested_video_device_;
465 466
466 // Observer to watch for content settings changed. 467 // Observer to watch for content settings changed.
467 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 468 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
468 469
469 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 470 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
470 }; 471 };
471 472
472 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 473 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698