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

Side by Side Diff: content/shell/browser/layout_test/layout_test_push_messaging_service.cc

Issue 1129833003: Rename "register" -> "subscribe" in the Push Messaging code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@p-userVisible-tests
Patch Set: Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/shell/browser/layout_test/layout_test_push_messaging_service.h " 5 #include "content/shell/browser/layout_test/layout_test_push_messaging_service.h "
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/browser/permission_type.h" 9 #include "content/public/browser/permission_type.h"
10 #include "content/shell/browser/layout_test/layout_test_browser_context.h" 10 #include "content/shell/browser/layout_test/layout_test_browser_context.h"
(...skipping 24 matching lines...) Expand all
35 LayoutTestPushMessagingService::LayoutTestPushMessagingService() { 35 LayoutTestPushMessagingService::LayoutTestPushMessagingService() {
36 } 36 }
37 37
38 LayoutTestPushMessagingService::~LayoutTestPushMessagingService() { 38 LayoutTestPushMessagingService::~LayoutTestPushMessagingService() {
39 } 39 }
40 40
41 GURL LayoutTestPushMessagingService::GetPushEndpoint() { 41 GURL LayoutTestPushMessagingService::GetPushEndpoint() {
42 return GURL("https://example.com/LayoutTestEndpoint"); 42 return GURL("https://example.com/LayoutTestEndpoint");
43 } 43 }
44 44
45 void LayoutTestPushMessagingService::RegisterFromDocument( 45 void LayoutTestPushMessagingService::SubscribeFromDocument(
46 const GURL& requesting_origin, 46 const GURL& requesting_origin,
47 int64 service_worker_registration_id, 47 int64 service_worker_registration_id,
48 const std::string& sender_id, 48 const std::string& sender_id,
49 int renderer_id, 49 int renderer_id,
50 int render_frame_id, 50 int render_frame_id,
51 bool user_visible, 51 bool user_visible,
52 const PushMessagingService::RegisterCallback& callback) { 52 const PushMessagingService::SubscribeCallback& callback) {
53 RegisterFromWorker(requesting_origin, service_worker_registration_id, 53 SubscribeFromWorker(requesting_origin, service_worker_registration_id,
54 sender_id, user_visible, callback); 54 sender_id, user_visible, callback);
55 } 55 }
56 56
57 void LayoutTestPushMessagingService::RegisterFromWorker( 57 void LayoutTestPushMessagingService::SubscribeFromWorker(
58 const GURL& requesting_origin, 58 const GURL& requesting_origin,
59 int64 service_worker_registration_id, 59 int64 service_worker_registration_id,
60 const std::string& sender_id, 60 const std::string& sender_id,
61 bool user_visible, 61 bool user_visible,
62 const PushMessagingService::RegisterCallback& callback) { 62 const PushMessagingService::SubscribeCallback& callback) {
63 if (GetPermissionStatus(requesting_origin, requesting_origin, user_visible) == 63 if (GetPermissionStatus(requesting_origin, requesting_origin, user_visible) ==
64 blink::WebPushPermissionStatusGranted) { 64 blink::WebPushPermissionStatusGranted) {
65 callback.Run("layoutTestRegistrationId", 65 callback.Run("layoutTestRegistrationId",
66 PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE); 66 PUSH_SUBSCRIPTION_STATUS_SUCCESS_FROM_PUSH_SERVICE);
67 } else { 67 } else {
68 callback.Run("registration_id", PUSH_REGISTRATION_STATUS_PERMISSION_DENIED); 68 callback.Run("registration_id", PUSH_SUBSCRIPTION_STATUS_PERMISSION_DENIED);
69 } 69 }
70 } 70 }
71 71
72 blink::WebPushPermissionStatus 72 blink::WebPushPermissionStatus
73 LayoutTestPushMessagingService::GetPermissionStatus( 73 LayoutTestPushMessagingService::GetPermissionStatus(
74 const GURL& requesting_origin, 74 const GURL& requesting_origin,
75 const GURL& embedding_origin, 75 const GURL& embedding_origin,
76 bool user_visible) { 76 bool user_visible) {
77 return ToWebPushPermissionStatus(LayoutTestContentBrowserClient::Get() 77 return ToWebPushPermissionStatus(LayoutTestContentBrowserClient::Get()
78 ->GetLayoutTestBrowserContext() 78 ->GetLayoutTestBrowserContext()
79 ->GetLayoutTestPermissionManager() 79 ->GetLayoutTestPermissionManager()
80 ->GetPermissionStatus(PermissionType::PUSH_MESSAGING, 80 ->GetPermissionStatus(PermissionType::PUSH_MESSAGING,
81 requesting_origin, 81 requesting_origin,
82 embedding_origin)); 82 embedding_origin));
83 } 83 }
84 84
85 void LayoutTestPushMessagingService::Unregister( 85 void LayoutTestPushMessagingService::Unsubscribe(
86 const GURL& requesting_origin, 86 const GURL& requesting_origin,
87 int64 service_worker_registration_id, 87 int64 service_worker_registration_id,
88 const std::string& sender_id, 88 const std::string& sender_id,
89 const UnregisterCallback& callback) { 89 const UnsubscribeCallback& callback) {
90 callback.Run(PUSH_UNREGISTRATION_STATUS_SUCCESS_UNREGISTERED); 90 callback.Run(PUSH_UNSUBSCRIPTION_STATUS_SUCCESS_UNSUBSCRIBED);
91 } 91 }
92 92
93 } // namespace content 93 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698