Include a deprecation warning when people only use "gcm_user_visible_only".

content/renderer/push_messaging/push_messaging_dispatcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/common/push_messaging_messages.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRegistration.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushError.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
+#include "third_party/WebKit/public/web/WebConsoleMessage.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 using blink::WebString;
 
 namespace content {
 
+const char kManifestDeprecationWarning[] =

[johnme, 2015/05/20 14:05:41]

Move to anonymous namespace?

[Peter Beverloo, 2015/05/20 14:15:13]

No, constants are internally linked by default so it wouldn't make a difference.

+    "The 'gcm_user_visible_only' manifest key is deprecated and will be "
+    "removed in Chrome 45, around August 2015. Use PushSubscriptionOptions "

[johnme, 2015/05/20 14:05:41]

Nit: How about "Call pushManager.subscribe({userVisibleOnly:true}) instead (see
https://w3c.github.io/push-api/#pushsubscriptionoptions-dictionary)." instead of
the last sentence.

[Peter Beverloo, 2015/05/20 14:15:14]

Changed..

+    "when subscribing for push instead.";
+
 PushMessagingDispatcher::PushMessagingDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame) {
 }
 
 PushMessagingDispatcher::~PushMessagingDispatcher() {}
 
 bool PushMessagingDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PushMessagingDispatcher, message)
     IPC_MESSAGE_HANDLER(PushMessagingMsg_RegisterFromDocumentSuccess,
@@ skipping 33 matching lines @@
   std::string sender_id =
       manifest.gcm_sender_id.is_null()
           ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string());
   if (sender_id.empty()) {
     OnRegisterFromDocumentError(request_id,
                                 PUSH_REGISTRATION_STATUS_NO_SENDER_ID);
     return;
   }
 
-  // TODO(peter): Display a deprecation warning if gcm_user_visible_only is
-  // set to true. See https://crbug.com/471534
+  // Support for the "gcm_user_visible_only" Manifest key has been deprecated
+  // in favor of the userVisibleOnly subscription option, and will be removed
+  // in a future Chrome release. Inform developers of this deprecation.
+  if (manifest.gcm_user_visible_only && !options.userVisibleOnly) {
+    blink::WebConsoleMessage message(
+        blink::WebConsoleMessage::LevelWarning,
+        blink::WebString::fromUTF8(kManifestDeprecationWarning));
+
+    render_frame()->GetWebFrame()->addMessageToConsole(message);

[johnme, 2015/05/20 14:05:41]

Ideally we'd log no more than once per page load; but I guess pages are unlikely
to subscribe many times per page load, so it's probably fine.

[Peter Beverloo, 2015/05/20 14:15:13]

Acknowledged.

+  }
+
   const bool user_visible = manifest.gcm_user_visible_only ||
                             options.userVisibleOnly;
 
   Send(new PushMessagingHostMsg_RegisterFromDocument(
       routing_id(), request_id,
       manifest.gcm_sender_id.is_null()
           ? std::string()
           : base::UTF16ToUTF8(manifest.gcm_sender_id.string()),
       user_visible, service_worker_registration_id));
 }
@@ skipping 24 matching lines @@
 
   scoped_ptr<blink::WebPushError> error(new blink::WebPushError(
       blink::WebPushError::ErrorTypeAbort,
       WebString::fromUTF8(PushRegistrationStatusToString(status))));
   callbacks->onError(error.release());
 
   subscription_callbacks_.Remove(request_id);
 }
 
 }  // namespace content