Move notification resource loading from content/child to blink

third_party/WebKit/Source/modules/notifications/Notification.h

Index: third_party/WebKit/Source/modules/notifications/Notification.h
diff --git a/third_party/WebKit/Source/modules/notifications/Notification.h b/third_party/WebKit/Source/modules/notifications/Notification.h
index 771751f9a274416ccb3d084cb7db7dfc70229534..0488e5df20caca8c2c645bc2e70eec5c7236363e 100644
--- a/third_party/WebKit/Source/modules/notifications/Notification.h
+++ b/third_party/WebKit/Source/modules/notifications/Notification.h
@@ -54,6 +54,7 @@ class ExecutionContext;
 class NotificationAction;
 class NotificationOptions;
 class NotificationPermissionCallback;
+class NotificationResourcesLoader;
 class ScriptState;
 
 class MODULES_EXPORT Notification final : public EventTargetWithInlineData, public ActiveScriptWrappable, public ActiveDOMObject, public WebNotificationDelegate {
@@ -124,14 +125,16 @@ protected:
 private:
     Notification(ExecutionContext*, const WebNotificationData&);
 
-    void scheduleShow();
+    void schedulePrepareShow();
 
-    // Calling show() may start asynchronous operation. If this object has
+    // Calling prepareShow() may start asynchronous operation. If this object has
     // a V8 wrapper, hasPendingActivity() prevents the wrapper from being
     // collected while m_state is Showing, and so this instance stays alive
     // until the operation completes. Otherwise, you need to hold a ref on this
     // instance until the operation completes.

[Peter Beverloo, 2016/04/13 18:32:27]

Out of interest, do you think this comment is still relevant?

[Michael van Ouwerkerk, 2016/04/14 13:42:11]

It appears to be an antique. I've moved it to a special place I have for such
things.

[Peter Beverloo, 2016/04/15 11:07:29]

I am fond of left-hand-side redness as well.

-    void show();
+    void prepareShow();
+
+    void didLoadResources(NotificationResourcesLoader*);
 
     void setPersistentId(int64_t persistentId) { m_persistentId = persistentId; }
 
@@ -158,7 +161,9 @@ private:
 
     NotificationState m_state;
 
-    Member<AsyncMethodRunner<Notification>> m_asyncRunner;
+    Member<AsyncMethodRunner<Notification>> m_prepareShowMethodRunner;
+
+    Member<NotificationResourcesLoader> m_loader;
 };
 
 } // namespace blink