base::Bind() conversion in renderer_host.

content/browser/renderer_host/render_widget_host_view_mac.mm

 // 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/render_widget_host_view_mac.h"
 
 #include <QuartzCore/QuartzCore.h>
 
+#include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #import "base/mac/scoped_nsautorelease_pool.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
@@ skipping 203 matching lines @@
 // RenderWidgetHostViewMac, public:
 
 RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
     : render_widget_host_(widget),
       about_to_validate_and_paint_(false),
       call_set_needs_display_in_rect_pending_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       is_loading_(false),
       is_hidden_(false),
       is_showing_context_menu_(false),
-      shutdown_factory_(this),
+      weak_factory_(this),
       accelerated_compositing_active_(false),
       needs_gpu_visibility_update_after_repaint_(false),
       compositing_surface_(gfx::kNullPluginWindow) {
   // |cocoa_view_| owns us and we will be deleted when |cocoa_view_| goes away.
   // Since we autorelease it, our caller must put |native_view()| into the view
   // hierarchy right after calling us.
   cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc]
                   initWithRenderWidgetHostViewMac:this] autorelease];
   render_widget_host_->SetView(this);
 }
@@ skipping 474 matching lines @@
     const gfx::Size& size) {
   return new BackingStoreMac(render_widget_host_, size);
 }
 
 // Sets whether or not to accept first responder status.
 void RenderWidgetHostViewMac::SetTakesFocusOnlyOnMouseDown(bool flag) {
   [cocoa_view_ setTakesFocusOnlyOnMouseDown:flag];
 }
 
 void RenderWidgetHostViewMac::KillSelf() {
-  if (shutdown_factory_.empty()) {
+  if (!weak_factory_.HasWeakPtrs()) {
     [cocoa_view_ setHidden:YES];
     MessageLoop::current()->PostTask(FROM_HERE,
-        shutdown_factory_.NewRunnableMethod(
-            &RenderWidgetHostViewMac::ShutdownHost));
+        base::Bind(&RenderWidgetHostViewMac::ShutdownHost,
+                   weak_factory_.GetWeakPtr()));
   }
 }
 
 void RenderWidgetHostViewMac::PluginFocusChanged(bool focused, int plugin_id) {
   [cocoa_view_ pluginFocusChanged:(focused ? YES : NO) forPlugin:plugin_id];
 }
 
 void RenderWidgetHostViewMac::StartPluginIme() {
   [cocoa_view_ setPluginImeActive:YES];
 }
@@ skipping 195 matching lines @@
   }
 
   // TODO(apatrick): Send the acknowledgement via the UI thread when running in
   // single process or in process GPU mode for now. This is bad from a
   // performance point of view but the plan is to not use AcceleratedSurface at
   // all in these cases.
   if (gpu_host_id == 0) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
-        NewRunnableFunction(&GpuProcessHostUIShim::SendToGpuHost,
-                            gpu_host_id,
-                            new AcceleratedSurfaceMsg_BuffersSwappedACK(
-                                route_id)));
+        base::Bind(&GpuProcessHostUIShim::SendToGpuHost,
+                   gpu_host_id,
+                   new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id)));
   } else {
     GpuProcessHost::SendOnIO(
         gpu_host_id,
         content::CAUSE_FOR_GPU_LAUNCH_NO_LAUNCH,
         new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id));
   }
 }
 
 void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 101 matching lines @@
 
   // Unlock position of mouse cursor and unhide it.
   CGAssociateMouseAndMouseCursorPosition(YES);
   [NSCursor unhide];
 
   if (render_widget_host_)
     render_widget_host_->LostMouseLock();
 }
 
 void RenderWidgetHostViewMac::ShutdownHost() {
-  shutdown_factory_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
   render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }
 
 gfx::Rect RenderWidgetHostViewMac::GetViewCocoaBounds() const {
   return gfx::Rect(NSRectToCGRect([cocoa_view_ bounds]));
 }
 
 void RenderWidgetHostViewMac::SetActive(bool active) {
   if (render_widget_host_)
@@ skipping 1674 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end