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

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

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 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
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 <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 bool blocked_by_policy); 318 bool blocked_by_policy);
319 void OnLocalStorageAccessed(const GURL& url, 319 void OnLocalStorageAccessed(const GURL& url,
320 bool local, 320 bool local,
321 bool blocked_by_policy); 321 bool blocked_by_policy);
322 void OnWebDatabaseAccessed(const GURL& url, 322 void OnWebDatabaseAccessed(const GURL& url,
323 const base::string16& name, 323 const base::string16& name,
324 const base::string16& display_name, 324 const base::string16& display_name,
325 bool blocked_by_policy); 325 bool blocked_by_policy);
326 void OnGeolocationPermissionSet(const GURL& requesting_frame, 326 void OnGeolocationPermissionSet(const GURL& requesting_frame,
327 bool allowed); 327 bool allowed);
328 #if defined(OS_ANDROID) 328 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
329 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame, 329 void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame,
330 bool allowed); 330 bool allowed);
331 #endif 331 #endif
332 332
333 // This method is called to update the status about the microphone and 333 // This method is called to update the status about the microphone and
334 // camera stream access. 334 // camera stream access.
335 void OnMediaStreamPermissionSet( 335 void OnMediaStreamPermissionSet(
336 const GURL& request_origin, 336 const GURL& request_origin,
337 MicrophoneCameraState new_microphone_camera_state, 337 MicrophoneCameraState new_microphone_camera_state,
338 const std::string& media_stream_selected_audio_device, 338 const std::string& media_stream_selected_audio_device,
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 std::string media_stream_requested_audio_device_; 453 std::string media_stream_requested_audio_device_;
454 std::string media_stream_requested_video_device_; 454 std::string media_stream_requested_video_device_;
455 455
456 // Observer to watch for content settings changed. 456 // Observer to watch for content settings changed.
457 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 457 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
458 458
459 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 459 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
460 }; 460 };
461 461
462 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 462 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698