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

Unified Diff: chrome/browser/chromeos/attestation/platform_verification_flow.cc

Issue 1942353002: (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/attestation/platform_verification_flow.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
index 2648a961a12342f655d27718ff4ff89dcc640236..7801c6907922c0bfdaa6358703e3e6fab7952311 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -27,6 +27,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "components/permissions/permission_status.mojom.h"
#include "components/user_manager/user.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
@@ -38,7 +39,6 @@
#include "content/public/common/url_constants.h"
#include "net/cert/pem_tokenizer.h"
#include "net/cert/x509_certificate.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
namespace {
@@ -112,14 +112,14 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
const GURL& requesting_origin = GetURL(web_contents).GetOrigin();
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
- blink::mojom::PermissionStatus status =
+ permissions::mojom::PermissionStatus status =
PermissionManager::Get(
Profile::FromBrowserContext(web_contents->GetBrowserContext()))
->GetPermissionStatus(
content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,
requesting_origin, embedding_origin);
- return status == blink::mojom::PermissionStatus::GRANTED;
+ return status == permissions::mojom::PermissionStatus::GRANTED;
}
bool IsInSupportedMode(content::WebContents* web_contents) override {
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698