Push API: register PushMessagingServiceImpl as GCMAppHandler.

components/gcm_driver/gcm_driver.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 "components/gcm_driver/gcm_driver.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "components/gcm_driver/gcm_app_handler.h"
@@ skipping 130 matching lines @@
        iter != app_handlers_.end(); ++iter) {
     iter->second->ShutdownHandler();
   }
   app_handlers_.clear();
 }
 
 void GCMDriver::AddAppHandler(const std::string& app_id,
                               GCMAppHandler* handler) {
   DCHECK(!app_id.empty());
   DCHECK(handler);
-  DCHECK(app_handlers_.find(app_id) == app_handlers_.end());
+  DCHECK(app_handlers_.count(app_id) == 0);
   app_handlers_[app_id] = handler;
 }
 
 void GCMDriver::RemoveAppHandler(const std::string& app_id) {
   DCHECK(!app_id.empty());
   app_handlers_.erase(app_id);
 }
 
 GCMAppHandler* GCMDriver::GetAppHandler(const std::string& app_id) {
+  // Look for exact match.
   GCMAppHandlerMap::const_iterator iter = app_handlers_.find(app_id);
-  return iter == app_handlers_.end() ? &default_app_handler_ : iter->second;
+  if (iter != app_handlers_.end())
+    return iter->second;
+
+  // Ask the handlers whether they know how to handle it.
+  iter = app_handlers_.begin();

[fgorski, 2014/06/17 17:24:00]

nit: any reason not to put it in the for header?

[Michael van Ouwerkerk, 2014/06/17 19:22:05]

Done.

+  for (; iter != app_handlers_.end(); ++iter) {
+    if (iter->second->CanHandle(app_id))
+      return iter->second;
+  }
+
+  return &default_app_handler_;
 }
 
 bool GCMDriver::HasRegisterCallback(const std::string& app_id) {
   return register_callbacks_.find(app_id) != register_callbacks_.end();
 }
 
 void GCMDriver::ClearCallbacks() {
   register_callbacks_.clear();
   unregister_callbacks_.clear();
   send_callbacks_.clear();
 }
 
 bool GCMDriver::IsAsyncOperationPending(const std::string& app_id) const {
   return register_callbacks_.find(app_id) != register_callbacks_.end() ||
          unregister_callbacks_.find(app_id) != unregister_callbacks_.end();
 }
 
 }  // namespace gcm