move EventHandler out of VideoCaptureController to make VS2005 happy

content/browser/renderer_host/video_capture_host.cc

 // Copyright (c) 2011 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/renderer_host/video_capture_host.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "content/common/video_capture_messages.h"
 
@@ skipping 13 matching lines @@
         NewRunnableMethod(this, &VideoCaptureHost::OnReadyToDelete, it->first));
   }
 }
 
 void VideoCaptureHost::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Implements VideoCaptureController::EventHandler.
-void VideoCaptureHost::OnError(VideoCaptureController::ControllerId id) {
+// Implements VideoCaptureControllerEventHandler.
+void VideoCaptureHost::OnError(const VideoCaptureControllerID& id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &VideoCaptureHost::DoHandleError, id.first,
-                        id.second));
+      NewRunnableMethod(this, &VideoCaptureHost::DoHandleError, id.routing_id,
+                        id.device_id));
 }
 
 void VideoCaptureHost::OnBufferReady(
-    VideoCaptureController::ControllerId id,
+    const VideoCaptureControllerID& id,
     TransportDIB::Handle handle,
     base::Time timestamp) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &VideoCaptureHost::DoSendFilledBuffer, id.first,
-                        id.second, handle, timestamp));
+      NewRunnableMethod(this, &VideoCaptureHost::DoSendFilledBuffer,
+                        id.routing_id, id.device_id, handle, timestamp));
 }
 
-void VideoCaptureHost::OnFrameInfo(VideoCaptureController::ControllerId id,
+void VideoCaptureHost::OnFrameInfo(const VideoCaptureControllerID& id,
                                    int width,
                                    int height,
                                    int frame_per_second) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &VideoCaptureHost::DoSendFrameInfo, id.first,
-                        id.second, width, height, frame_per_second));
+      NewRunnableMethod(this, &VideoCaptureHost::DoSendFrameInfo, id.routing_id,
+                        id.device_id, width, height, frame_per_second));
 }
 
-void VideoCaptureHost::OnReadyToDelete(
-    VideoCaptureController::ControllerId id) {
+void VideoCaptureHost::OnReadyToDelete(const VideoCaptureControllerID& id) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &VideoCaptureHost::DoDeleteVideoCaptureController,
                         id));
 }
 
 void VideoCaptureHost::DoSendFilledBuffer(int32 routing_id,
                                           int device_id,
                                           TransportDIB::Handle handle,
                                           base::Time timestamp) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   Send(new VideoCaptureMsg_BufferReady(routing_id, device_id, handle,
                                        timestamp));
 }
 
 void VideoCaptureHost::DoHandleError(int32 routing_id, int device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   Send(new VideoCaptureMsg_StateChanged(routing_id, device_id,
                                         media::VideoCapture::kError));
 
-  VideoCaptureController::ControllerId id(routing_id, device_id);
+  VideoCaptureControllerID id(routing_id, device_id);
   EntryMap::iterator it = entries_.find(id);
   if (it != entries_.end()) {
     VideoCaptureController* controller = it->second;
     controller->StopCapture(NULL);
   }
 }
 
 void VideoCaptureHost::DoSendFrameInfo(int32 routing_id,
                                        int device_id,
                                        int width,
@@ skipping 23 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
 void VideoCaptureHost::OnStartCapture(const IPC::Message& msg, int device_id,
                                       const media::VideoCaptureParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerID controller_id(msg.routing_id(), device_id);
 
   DCHECK(entries_.find(controller_id) == entries_.end());
 
   scoped_refptr<VideoCaptureController> controller =
       new VideoCaptureController(controller_id, peer_handle(), this);
   entries_.insert(std::make_pair(controller_id, controller));
   controller->StartCapture(params);
 }
 
 void VideoCaptureHost::OnStopCapture(const IPC::Message& msg, int device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerID controller_id(msg.routing_id(), device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     scoped_refptr<VideoCaptureController> controller = it->second;
     controller->StopCapture(NULL);
   } else {
     // It does not exist so it must have been stopped already.
     Send(new VideoCaptureMsg_StateChanged(msg.routing_id(), device_id,
                                           media::VideoCapture::kStopped));
   }
 }
 
 void VideoCaptureHost::OnPauseCapture(const IPC::Message& msg, int device_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Not used.
   Send(new VideoCaptureMsg_StateChanged(msg.routing_id(), device_id,
                                         media::VideoCapture::kError));
 }
 
 void VideoCaptureHost::OnReceiveEmptyBuffer(const IPC::Message& msg,
                                             int device_id,
                                             TransportDIB::Handle handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  VideoCaptureController::ControllerId controller_id(msg.routing_id(),
-                                                     device_id);
+  VideoCaptureControllerID controller_id(msg.routing_id(), device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     scoped_refptr<VideoCaptureController> controller = it->second;
     controller->ReturnTransportDIB(handle);
   }
 }
 
 void VideoCaptureHost::DoDeleteVideoCaptureController(
-    VideoCaptureController::ControllerId id) {
+    const VideoCaptureControllerID& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Report that the device have successfully been stopped.
-  Send(new VideoCaptureMsg_StateChanged(id.first, id.second,
+  Send(new VideoCaptureMsg_StateChanged(id.routing_id, id.device_id,
                                         media::VideoCapture::kStopped));
   entries_.erase(id);
 }