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

Side by Side Diff: content/renderer/push_messaging/push_messaging_dispatcher.cc

Issue 1254023006: Move ServiceWorker public headers to public/{web,platform}/modules/serviceworker (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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/renderer/push_messaging/push_messaging_dispatcher.h" 5 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/child/service_worker/web_service_worker_registration_impl.h" 8 #include "content/child/service_worker/web_service_worker_registration_impl.h"
9 #include "content/common/push_messaging_messages.h" 9 #include "content/common/push_messaging_messages.h"
10 #include "content/renderer/manifest/manifest_manager.h" 10 #include "content/renderer/manifest/manifest_manager.h"
11 #include "content/renderer/render_frame_impl.h" 11 #include "content/renderer/render_frame_impl.h"
12 #include "ipc/ipc_message.h" 12 #include "ipc/ipc_message.h"
13 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 13 #include "third_party/WebKit/public/platform/WebString.h"
15 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError .h" 14 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError .h"
16 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubsc ription.h" 15 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubsc ription.h"
17 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubsc riptionOptions.h" 16 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubsc riptionOptions.h"
17 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerRegistration.h"
18 #include "third_party/WebKit/public/web/WebConsoleMessage.h" 18 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
19 #include "third_party/WebKit/public/web/WebLocalFrame.h" 19 #include "third_party/WebKit/public/web/WebLocalFrame.h"
20 #include "url/gurl.h" 20 #include "url/gurl.h"
21 21
22 namespace content { 22 namespace content {
23 23
24 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame) 24 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame)
25 : RenderFrameObserver(render_frame) { 25 : RenderFrameObserver(render_frame) {
26 } 26 }
27 27
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 scoped_ptr<blink::WebPushError> error(new blink::WebPushError( 107 scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
108 blink::WebPushError::ErrorTypeAbort, 108 blink::WebPushError::ErrorTypeAbort,
109 blink::WebString::fromUTF8(PushRegistrationStatusToString(status)))); 109 blink::WebString::fromUTF8(PushRegistrationStatusToString(status))));
110 callbacks->onError(error.release()); 110 callbacks->onError(error.release());
111 111
112 subscription_callbacks_.Remove(request_id); 112 subscription_callbacks_.Remove(request_id);
113 } 113 }
114 114
115 } // namespace content 115 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698