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

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

Issue 778243002: Push API: Return cached registration if available. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@store2
Patch Set: Rebase Created 6 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 | « content/public/common/push_messaging_status.cc ('k') | tools/metrics/histograms/histograms.xml » ('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 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/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 29 matching lines...) Expand all
40 sender_id, callback); 40 sender_id, callback);
41 } 41 }
42 42
43 void LayoutTestPushMessagingService::RegisterFromWorker( 43 void LayoutTestPushMessagingService::RegisterFromWorker(
44 const GURL& requesting_origin, 44 const GURL& requesting_origin,
45 int64 service_worker_registration_id, 45 int64 service_worker_registration_id,
46 const std::string& sender_id, 46 const std::string& sender_id,
47 const PushMessagingService::RegisterCallback& callback) { 47 const PushMessagingService::RegisterCallback& callback) {
48 if (GetPermissionStatus(requesting_origin, requesting_origin) == 48 if (GetPermissionStatus(requesting_origin, requesting_origin) ==
49 blink::WebPushPermissionStatusGranted) { 49 blink::WebPushPermissionStatusGranted) {
50 callback.Run("layoutTestRegistrationId", PUSH_REGISTRATION_STATUS_SUCCESS); 50 callback.Run("layoutTestRegistrationId",
51 PUSH_REGISTRATION_STATUS_SUCCESS_FROM_PUSH_SERVICE);
51 } else { 52 } else {
52 callback.Run("registration_id", PUSH_REGISTRATION_STATUS_PERMISSION_DENIED); 53 callback.Run("registration_id", PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
53 } 54 }
54 } 55 }
55 56
56 blink::WebPushPermissionStatus 57 blink::WebPushPermissionStatus
57 LayoutTestPushMessagingService::GetPermissionStatus( 58 LayoutTestPushMessagingService::GetPermissionStatus(
58 const GURL& requesting_origin, 59 const GURL& requesting_origin,
59 int renderer_id, 60 int renderer_id,
60 int render_frame_id) { 61 int render_frame_id) {
61 return GetPermissionStatus(requesting_origin, requesting_origin); 62 return GetPermissionStatus(requesting_origin, requesting_origin);
62 } 63 }
63 64
64 blink::WebPushPermissionStatus 65 blink::WebPushPermissionStatus
65 LayoutTestPushMessagingService::GetPermissionStatus( 66 LayoutTestPushMessagingService::GetPermissionStatus(
66 const GURL& requesting_origin, 67 const GURL& requesting_origin,
67 const GURL& embedding_origin) { 68 const GURL& embedding_origin) {
68 const auto& it = permission_map_.find(requesting_origin); 69 const auto& it = permission_map_.find(requesting_origin);
69 if (it == permission_map_.end()) 70 if (it == permission_map_.end())
70 return blink::WebPushPermissionStatusDefault; 71 return blink::WebPushPermissionStatusDefault;
71 return it->second; 72 return it->second;
72 } 73 }
73 74
74 } // namespace content 75 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/push_messaging_status.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698