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

Side by Side Diff: chrome/browser/media/protected_media_identifier_permission_context.h

Issue 2586153002: Move kill switch and secure origin checking logic (Closed)
Patch Set: Move kill switch and secure origin checking logic Created 4 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
« no previous file with comments | « no previous file | chrome/browser/media/protected_media_identifier_permission_context.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_ 5 #ifndef CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
6 #define CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_ 6 #define CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/permissions/permission_context_base.h" 10 #include "chrome/browser/permissions/permission_context_base.h"
(...skipping 27 matching lines...) Expand all
38 38
39 // PermissionContextBase implementation. 39 // PermissionContextBase implementation.
40 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
41 void DecidePermission(content::WebContents* web_contents, 41 void DecidePermission(content::WebContents* web_contents,
42 const PermissionRequestID& id, 42 const PermissionRequestID& id,
43 const GURL& requesting_origin, 43 const GURL& requesting_origin,
44 const GURL& embedding_origin, 44 const GURL& embedding_origin,
45 bool user_gesture, 45 bool user_gesture,
46 const BrowserPermissionCallback& callback) override; 46 const BrowserPermissionCallback& callback) override;
47 #endif // defined(OS_CHROMEOS) 47 #endif // defined(OS_CHROMEOS)
48 ContentSetting GetPermissionStatus( 48 ContentSetting GetPermissionStatusInternal(
49 const GURL& requesting_origin, 49 const GURL& requesting_origin,
50 const GURL& embedding_origin) const override; 50 const GURL& embedding_origin) const override;
51 void CancelPermissionRequest(content::WebContents* web_contents, 51 void CancelPermissionRequest(content::WebContents* web_contents,
52 const PermissionRequestID& id) override; 52 const PermissionRequestID& id) override;
53 53
54 private: 54 private:
55 void UpdateTabContext(const PermissionRequestID& id, 55 void UpdateTabContext(const PermissionRequestID& id,
56 const GURL& requesting_frame, 56 const GURL& requesting_frame,
57 bool allowed) override; 57 bool allowed) override;
58 bool IsRestrictedToSecureOrigins() const override; 58 bool IsRestrictedToSecureOrigins() const override;
(...skipping 24 matching lines...) Expand all
83 83
84 // Must be the last member, to ensure that it will be 84 // Must be the last member, to ensure that it will be
85 // destroyed first, which will invalidate weak pointers 85 // destroyed first, which will invalidate weak pointers
86 base::WeakPtrFactory<ProtectedMediaIdentifierPermissionContext> weak_factory_; 86 base::WeakPtrFactory<ProtectedMediaIdentifierPermissionContext> weak_factory_;
87 #endif 87 #endif
88 88
89 DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierPermissionContext); 89 DISALLOW_COPY_AND_ASSIGN(ProtectedMediaIdentifierPermissionContext);
90 }; 90 };
91 91
92 #endif // CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_ 92 #endif // CHROME_BROWSER_MEDIA_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_CONTEXT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/protected_media_identifier_permission_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698