Add TraySms for SMS messages.

chromeos/dbus/gsm_sms_client.cc

 // Copyright (c) 2012 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 "chromeos/dbus/gsm_sms_client.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
@@ skipping 212 matching lines @@
   dbus::Bus* bus_;
   ProxyMap proxies_;
   STLValueDeleter<ProxyMap> proxies_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(GsmSMSClientImpl);
 };
 
 // A stub implementaion of GsmSMSClient.
 class GsmSMSClientStubImpl : public GsmSMSClient {
  public:
-  GsmSMSClientStubImpl() : test_index_(0), weak_ptr_factory_(this) {
+  GsmSMSClientStubImpl() : test_index_(-1), weak_ptr_factory_(this) {
     test_messages_.push_back("Test Message 0");
     test_messages_.push_back("Test Message 1");
     test_messages_.push_back("Test a relatively long message 2");
     test_messages_.push_back("Test a very, the quick brown fox jumped"
                              " over the lazy dog, long message 3");
     test_messages_.push_back("Test Message 4");
     test_messages_.push_back("Test Message 5");
     test_messages_.push_back("Test Message 6");
   }
 
@@ skipping 40 matching lines @@
   // GsmSMSClient override.
   virtual void List(const std::string& service_name,
                     const dbus::ObjectPath& object_path,
                     const ListCallback& callback) OVERRIDE {
     callback.Run(message_list_);
   }
 
   // GsmSMSClient override.
   virtual void RequestUpdate(const std::string& service_name,
                              const dbus::ObjectPath& object_path) {
-    PushTestMessageChain();
+    if (test_index_ >= 0)
+      return;
+    test_index_ = 0;
+    // Call PushTestMessageChain asynchronously so that the handler_ callback
+    // does not get called from the update request.
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&GsmSMSClientStubImpl::PushTestMessageChain,
+                   weak_ptr_factory_.GetWeakPtr()));
   }
 
  private:
   void PushTestMessageChain() {
     if (PushTestMessage())
       PushTestMessageDelayed();
   }
 
   void PushTestMessageDelayed() {
     const int kSmsMessageDelaySeconds = 5;
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&GsmSMSClientStubImpl::PushTestMessageChain,
                    weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromSeconds(kSmsMessageDelaySeconds));
   }
 
   bool PushTestMessage() {
-    if (test_index_ >= test_messages_.size())
+    if (test_index_ >= static_cast<int>(test_messages_.size()))
       return false;
     base::DictionaryValue* message = new base::DictionaryValue;
     message->SetString("number", "000-000-0000");
     message->SetString("text", test_messages_[test_index_]);
     message->SetInteger("index", test_index_);
     int msg_index = message_list_.GetSize();
     message_list_.Append(message);
     if (!handler_.is_null())
       handler_.Run(msg_index, true);
     ++test_index_;
     return true;
   }
 
-  size_t test_index_;
+  int test_index_;
   std::vector<std::string> test_messages_;
   base::ListValue message_list_;
   SmsReceivedHandler handler_;
   base::WeakPtrFactory<GsmSMSClientStubImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GsmSMSClientStubImpl);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // GsmSMSClient
 
 GsmSMSClient::GsmSMSClient() {}
 
 GsmSMSClient::~GsmSMSClient() {}
 
 // static
 GsmSMSClient* GsmSMSClient::Create(DBusClientImplementationType type,
                                    dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new GsmSMSClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new GsmSMSClientStubImpl();
 }
 
 }  // namespace chromeos