base::Bind: Convert chrome_frame/.

chrome_frame/chrome_frame_delegate.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
 #define CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <queue>
 #include <string>
 #include <vector>
 
+#include "base/callback.h"
 #include "base/file_path.h"
 #include "base/location.h"
+#include "base/pending_task.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "chrome/common/automation_constants.h"
 #include "ipc/ipc_message.h"
 
 class GURL;
 struct AttachExternalTabParams;
 struct AutomationURLRequest;
 struct ContextMenuModel;
 struct MiniContextMenuParams;
@@ skipping 31 matching lines @@
   virtual bool IsValid() const = 0;
 
   // To be called when the top-most window of an application hosting
   // ChromeFrame is moved.
   virtual void OnHostMoved() = 0;
 
  protected:
   virtual ~ChromeFrameDelegate() {}
 };
 
-// Disable refcounting of ChromeFrameDelegate.
-DISABLE_RUNNABLE_METHOD_REFCOUNT(ChromeFrameDelegate);
-
 extern UINT kAutomationServerReady;
 extern UINT kMessageFromChromeFrame;
 
 class ChromeFrameDelegateImpl : public ChromeFrameDelegate {
  public:
   virtual WindowType GetWindow() { return NULL; }
   virtual void GetBounds(RECT* bounds) {}
   virtual std::string GetDocumentUrl() { return std::string(); }
   virtual void OnAutomationServerReady() {}
   virtual void OnAutomationServerLaunchFailed(
       AutomationLaunchResult reason, const std::string& server_version) {}
   virtual void OnLoadFailed(int error_code, const std::string& url) {}
   virtual bool OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError() {}
 
   static bool IsTabMessage(const IPC::Message& message);
 
   virtual bool IsValid() const {
     return true;
   }
 
   virtual void OnHostMoved() {}
 
  protected:
-  // Protected methods to be overriden.
+  // Protected methods to be overridden.
   virtual void OnNavigationStateChanged(
       int flags, const NavigationInfo& nav_info) {}
   virtual void OnUpdateTargetUrl(const std::wstring& new_target_url) {}
   virtual void OnAcceleratorPressed(const MSG& accel_message) {}
   virtual void OnTabbedOut(bool reverse) {}
   virtual void OnOpenURL(
       const GURL& url, const GURL& referrer, int open_disposition) {}
   virtual void OnDidNavigate(const NavigationInfo& navigation_info) {}
   virtual void OnNavigationFailed(int error_code, const GURL& gurl) {}
   virtual void OnLoad(const GURL& url) {}
@@ skipping 16 matching lines @@
   virtual void OnGoToHistoryEntryOffset(int offset) {}
 
   virtual void OnGetCookiesFromHost(const GURL& url, int cookie_id) {}
   virtual void OnCloseTab() {}
 };
 
 // This interface enables tasks to be marshaled to desired threads.
 class TaskMarshaller {  // NOLINT
  public:
   virtual void PostTask(const tracked_objects::Location& from_here,
-                        Task* task) = 0;
+                        const base::Closure& task) = 0;
 };
 
 // T is expected to be something CWindowImpl derived, or at least to have
 // PostMessage(UINT, WPARAM) method. Do not forget to CHAIN_MSG_MAP
 template <class T> class TaskMarshallerThroughWindowsMessages
     : public TaskMarshaller {
  public:
   TaskMarshallerThroughWindowsMessages() {}
-  virtual void PostTask(const tracked_objects::Location& from_here,
-                        Task* task) {
+  virtual void PostTask(const tracked_objects::Location& posted_from,
+                        const base::Closure& task) OVERRIDE {
     T* this_ptr = static_cast<T*>(this);
     if (this_ptr->IsWindow()) {
       this_ptr->AddRef();
-      PushTask(task);
-      this_ptr->PostMessage(MSG_EXECUTE_TASK, reinterpret_cast<WPARAM>(task));
+      base::PendingTask* pending_task = new PendingTask(posted_from, task);
+      PushTask(pending_task);
+      this_ptr->PostMessage(MSG_EXECUTE_TASK,
+                            reinterpret_cast<WPARAM>(pending_task));
     } else {
       DVLOG(1) << "Dropping MSG_EXECUTE_TASK message for destroyed window.";
-      delete task;
     }
   }
 
  protected:
   ~TaskMarshallerThroughWindowsMessages() {
     DeleteAllPendingTasks();
   }
 
   void DeleteAllPendingTasks() {
     base::AutoLock lock(lock_);
     DVLOG_IF(1, !pending_tasks_.empty()) << "Destroying "
                                          << pending_tasks_.size()
                                          << " pending tasks";
     while (!pending_tasks_.empty()) {
-      Task* task = pending_tasks_.front();
+      PendingTask* task = pending_tasks_.front();
       pending_tasks_.pop();
       delete task;
     }
   }
 
   BEGIN_MSG_MAP(PostMessageMarshaller)
     MESSAGE_HANDLER(MSG_EXECUTE_TASK, ExecuteTask)
   END_MSG_MAP()
 
  private:
   enum { MSG_EXECUTE_TASK = WM_APP + 6 };
   inline LRESULT ExecuteTask(UINT, WPARAM wparam, LPARAM,
                              BOOL& handled) {  // NOLINT
-    Task* task = reinterpret_cast<Task*>(wparam);
+    base::PendingTask* task = reinterpret_cast<base::PendingTask*>(wparam);
     if (task && PopTask(task)) {
-      task->Run();
+      task->task.Run();

[awong, 2011/11/18 02:21:10]

Being OCD...but can we call the local variable pending_task?

[James Hawkins, 2011/11/18 02:24:44]

Done.

       delete task;
     }
 
     T* this_ptr = static_cast<T*>(this);
     this_ptr->Release();
     return 0;
   }
 
-  inline void PushTask(Task* task) {
+  inline void PushTask(base::PendingTask* task) {
     base::AutoLock lock(lock_);
     pending_tasks_.push(task);
   }
 
   // If the given task is front of the queue, removes the task and returns true,
   // otherwise we assume this is an already destroyed task (but Window message
   // had remained in the thread queue).
-  inline bool PopTask(Task* task) {
+  inline bool PopTask(PendingTask* task) {
     base::AutoLock lock(lock_);
     if (!pending_tasks_.empty() && task == pending_tasks_.front()) {
       pending_tasks_.pop();
       return true;
     }
 
     return false;
   }
 
   base::Lock lock_;
-  std::queue<Task*> pending_tasks_;
+  std::queue<base::PendingTask*> pending_tasks_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_DELEGATE_H_