Add IPC messages for ARC notification

components/arc/arc_bridge_service_impl.cc

 // Copyright 2015 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/arc/arc_bridge_service_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 82 matching lines @@
   chromeos::SessionManagerClient* session_manager_client =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager_client->StopArcInstance(base::Bind(
       &ArcBridgeServiceImpl::OnInstanceStopped, weak_factory_.GetWeakPtr()));
 }
 
 bool ArcBridgeServiceImpl::RegisterInputDevice(const std::string& name,
                                                const std::string& device_type,
                                                base::ScopedFD fd) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
-  if (state() != State::READY) {
-    LOG(ERROR) << "Called RegisterInputDevice when the service is not ready";
-    return false;
-  }
-  return ipc_channel_->Send(new ArcInstanceMsg_RegisterInputDevice(
+  return SendMessageIfReady(new ArcInstanceMsg_RegisterInputDevice(
       name, device_type, base::FileDescriptor(fd.Pass())));
 }
 
+bool ArcBridgeServiceImpl::SendNotificationEventToAndroid(
+    const std::string& key, ArcNotificationEvent event) {
+  DCHECK(ipc_task_runner_->RunsTasksOnCurrentThread());
+  if (key.empty()) {
+    LOG(ERROR) << "NotifyNotificationEvent failed: Wrong parameter";

[elijahtaylor1, 2015/12/01 07:02:36]

method rename in log message

[yoshiki, 2015/12/02 02:38:24]

Done.

+    return false;
+  }
+  return SendMessageIfReady(
+      new ArcInstanceMsg_NotifyNotificationEvent(key, event));

[elijahtaylor1, 2015/12/01 07:02:36]

I think the method name change should go all the way through to the message,
ArcInstanceMsg_SendNotificationEventToAndroid, or if you think that's too
redundant, get rid of ToAndroid.

[yoshiki, 2015/12/02 02:38:24]

Done.

+}
+
 void ArcBridgeServiceImpl::SocketConnect(const base::FilePath& socket_path) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   if (state() != State::STOPPED) {
     VLOG(1) << "SocketConnect() called when instance is not stopped";
     return;
   }
   SetState(State::CONNECTING);
   base::PostTaskAndReplyWithResult(
       file_task_runner_.get(), FROM_HERE,
       base::Bind(&base::CreateDirectory, socket_path.DirName()),
@@ skipping 64 matching lines @@
   }
 
   SetState(State::STARTING);
   chromeos::SessionManagerClient* session_manager_client =
       chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
   session_manager_client->StartArcInstance(
       socket_path.value(), base::Bind(&ArcBridgeServiceImpl::OnInstanceStarted,
                                       weak_factory_.GetWeakPtr()));
 }
 
+bool ArcBridgeServiceImpl::SendMessageIfReady(IPC::Message* message) {
+  DCHECK(ipc_task_runner_->RunsTasksOnCurrentThread());
+  if (state() != State::READY) {
+    LOG(ERROR) << "Tried to send a message but the service is not ready";

[elijahtaylor1, 2015/12/01 07:02:36]

too bad we lose the actual method name here, is there any printable information
from |message| we could add to this log?

[yoshiki, 2015/12/02 02:38:24]

Let me revert back here to the original. I think creating this method is too
much abstraction as for now. Let's do this when necessary.

+    return false;
+  }
+  return ipc_channel_->Send(message);
+}
+
 void ArcBridgeServiceImpl::OnInstanceStarted(bool success) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   if (state() != State::STARTING) {
     VLOG(1) << "StopInstance() called while connecting";
     return;
   }
   if (!success) {
     LOG(ERROR) << "ARC instance unable to start. Shutting down the bridge";
     StopInstance();
     return;
   }
 }
 
 void ArcBridgeServiceImpl::OnInstanceBootPhase(InstanceBootPhase phase) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   // The state can be STARTING the first time this is called, and will then
   // transition to READY after BRIDGE_READY has been passed.
   if (state() != State::STARTING && state() != State::READY) {
     VLOG(1) << "StopInstance() called while connecting";
     return;
   }
   if (phase == InstanceBootPhase::BRIDGE_READY) {
     SetState(State::READY);
   }
   FOR_EACH_OBSERVER(Observer, observer_list(), OnInstanceBootPhase(phase));
 }
 
+void ArcBridgeServiceImpl::OnNotificationPostedFromAndroid(
+    const arc::ArcNotificationData& data) {
+  DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
+  FOR_EACH_OBSERVER(Observer, observer_list(),
+                    OnNotificationPostedFromAndroid(data));
+}
+
+void ArcBridgeServiceImpl::OnNotificationRemovedFromAndroid(
+    const std::string& key) {
+  DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
+  FOR_EACH_OBSERVER(Observer, observer_list(),
+                    OnNotificationRemovedFromAndroid(key));
+}
+
 bool ArcBridgeServiceImpl::OnMessageReceived(const IPC::Message& message) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(ArcBridgeServiceImpl, message)
     IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_InstanceBootPhase,
                         OnInstanceBootPhase)
+    IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_NotificationPosted,
+                        OnNotificationPostedFromAndroid)
+    IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_NotificationRemoved,
+                        OnNotificationRemovedFromAndroid)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   if (!handled)
     LOG(ERROR) << "Invalid message with type = " << message.type();
   return handled;
 }
 
 void ArcBridgeServiceImpl::OnArcAvailable(bool arc_available) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   if (available() == arc_available)
     return;
   SetAvailable(arc_available);
   PrerequisitesChanged();
 }
 
 void ArcBridgeServiceImpl::OnInstanceStopped(bool success) {
   DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
   // STOPPING is the only valid state for this function.
   // DCHECK on enum classes not supported.
   DCHECK(state() == State::STOPPING);
   ipc_channel_.reset();
   SetState(State::STOPPED);
 }
 
 }  // namespace arc