diff options
| author | miguelg <miguelg@chromium.org> | 2015-05-06 02:49:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-06 09:49:55 +0000 |
| commit | fbff6438f1f417649e193787d77e9a18a8c322fb (patch) | |
| tree | f808cc55ed1ba53eca6dd36e2f47a9fc4d8390c4 /content | |
| parent | 9c086426f0e4f8f77706ea02abb927419c51d907 (diff) | |
| download | chromium_src-fbff6438f1f417649e193787d77e9a18a8c322fb.zip chromium_src-fbff6438f1f417649e193787d77e9a18a8c322fb.tar.gz chromium_src-fbff6438f1f417649e193787d77e9a18a8c322fb.tar.bz2 | |
Rename default to prompt in the PushPermissionState enum (2/3)
Change both the real and the mock implementation to use the new
enum value.
This CL is part of a three-sided patch:
[1] https://codereview.chromium.org/1116073005/
[2] This CL
[3] Cleanup where "default" is removed from the enum value the layout tests are re-enabled and renamed. - Coming soon
BUG=479246
TBR=mkwst
Review URL: https://codereview.chromium.org/1125923004
Cr-Commit-Position: refs/heads/master@{#328512}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/push_messaging/push_messaging_message_filter.cc | 4 | ||||
| -rw-r--r-- | content/shell/browser/layout_test/layout_test_push_messaging_service.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/push_messaging/push_messaging_message_filter.cc b/content/browser/push_messaging/push_messaging_message_filter.cc index cd2403e..da9d510 100644 --- a/content/browser/push_messaging/push_messaging_message_filter.cc +++ b/content/browser/push_messaging/push_messaging_message_filter.cc @@ -782,8 +782,8 @@ void PushMessagingMessageFilter::Core::GetPermissionStatusOnUI( embedding_origin, user_visible); } else if (is_incognito()) { - // Return default, so the website can't detect incognito mode. - permission_status = blink::WebPushPermissionStatusDefault; + // Return prompt, so the website can't detect incognito mode. + permission_status = blink::WebPushPermissionStatusPrompt; } else { Send(new PushMessagingMsg_GetPermissionStatusError(request_id)); return; diff --git a/content/shell/browser/layout_test/layout_test_push_messaging_service.cc b/content/shell/browser/layout_test/layout_test_push_messaging_service.cc index b3a255b..5f0b0ec 100644 --- a/content/shell/browser/layout_test/layout_test_push_messaging_service.cc +++ b/content/shell/browser/layout_test/layout_test_push_messaging_service.cc @@ -23,7 +23,7 @@ blink::WebPushPermissionStatus ToWebPushPermissionStatus( case PERMISSION_STATUS_DENIED: return blink::WebPushPermissionStatusDenied; case PERMISSION_STATUS_ASK: - return blink::WebPushPermissionStatusDefault; + return blink::WebPushPermissionStatusPrompt; } NOTREACHED(); |