| Index: content/child/background_sync/background_sync_provider.cc
|
| diff --git a/content/child/background_sync/background_sync_provider.cc b/content/child/background_sync/background_sync_provider.cc
|
| index 57f3d56322092e3ab579597be012ff148f7e85e4..c7652ebeaab85deabd84d699446177d479c97f4f 100644
|
| --- a/content/child/background_sync/background_sync_provider.cc
|
| +++ b/content/child/background_sync/background_sync_provider.cc
|
| @@ -6,11 +6,11 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "components/permission/public/interfaces/permission_status.mojom.h"
|
| #include "content/child/background_sync/background_sync_type_converters.h"
|
| #include "content/child/service_worker/web_service_worker_registration_impl.h"
|
| #include "content/child/worker_task_runner.h"
|
| #include "content/public/common/background_sync.mojom.h"
|
| -#include "content/public/common/permission_status.mojom.h"
|
| #include "content/public/common/service_registry.h"
|
| #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncError.h"
|
| #include "third_party/WebKit/public/platform/modules/background_sync/WebSyncRegistration.h"
|
| @@ -300,18 +300,18 @@ void BackgroundSyncProvider::GetRegistrationsCallback(
|
| void BackgroundSyncProvider::GetPermissionStatusCallback(
|
| scoped_ptr<blink::WebSyncGetPermissionStatusCallbacks> callbacks,
|
| BackgroundSyncError error,
|
| - PermissionStatus status) {
|
| + permission::Status status) {
|
| // TODO(iclelland): Determine the correct error message to return in each case
|
| switch (error) {
|
| case BACKGROUND_SYNC_ERROR_NONE:
|
| switch (status) {
|
| - case PERMISSION_STATUS_GRANTED:
|
| + case permission::STATUS_GRANTED:
|
| callbacks->onSuccess(blink::WebSyncPermissionStatusGranted);
|
| break;
|
| - case PERMISSION_STATUS_DENIED:
|
| + case permission::STATUS_DENIED:
|
| callbacks->onSuccess(blink::WebSyncPermissionStatusDenied);
|
| break;
|
| - case PERMISSION_STATUS_ASK:
|
| + case permission::STATUS_ASK:
|
| callbacks->onSuccess(blink::WebSyncPermissionStatusPrompt);
|
| break;
|
| }
|
|
|