Gamepad: don't notify about connected pads twice

content/browser/gamepad/gamepad_service.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 "content/browser/gamepad/gamepad_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "content/browser/gamepad/gamepad_consumer.h"
 #include "content/browser/gamepad/gamepad_data_fetcher.h"
 #include "content/browser/gamepad/gamepad_provider.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace content {
 
+namespace {
+GamepadService* g_gamepad_service = 0;
+}
+
 GamepadService::GamepadService()
     : num_active_consumers_(0),
       gesture_callback_pending_(false) {
+  SetInstance();
 }
 
 GamepadService::GamepadService(scoped_ptr<GamepadDataFetcher> fetcher)
     : provider_(new GamepadProvider(fetcher.Pass())),
       num_active_consumers_(0),
       gesture_callback_pending_(false) {
+  SetInstance();
   thread_checker_.DetachFromThread();
 }
 
 GamepadService::~GamepadService() {
 }
 
+void GamepadService::SetInstance() {
+  CHECK(!g_gamepad_service);
+  g_gamepad_service = this;
+}
+
 GamepadService* GamepadService::GetInstance() {
-  return Singleton<GamepadService,
-                   LeakySingletonTraits<GamepadService> >::get();
+  if (!g_gamepad_service)
+    g_gamepad_service = new GamepadService;
+  return g_gamepad_service;
 }
 
 void GamepadService::ConsumerBecameActive(GamepadConsumer* consumer) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!provider_)
     provider_.reset(new GamepadProvider);
 
   std::pair<ConsumerSet::iterator, bool> insert_result =
       consumers_.insert(consumer);
   insert_result.first->is_active = true;
   if (!insert_result.first->did_observe_user_gesture &&
       !gesture_callback_pending_) {
+    gesture_callback_pending_ = true;
     provider_->RegisterForUserGesture(
           base::Bind(&GamepadService::OnUserGesture,
                      base::Unretained(this)));
   }
 
   if (num_active_consumers_++ == 0)
     provider_->Resume();
 }
 
 void GamepadService::ConsumerBecameInactive(GamepadConsumer* consumer) {
@@ skipping 75 matching lines @@
       for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) {
         const blink::WebGamepad& pad = gamepads.items[i];
         if (pad.connected)
           info.consumer->OnGamepadConnected(i, pad);
       }
     }
   }
 }
 
 }  // namespace content