Use Closure instead of ScopedRunnableFactory in StatusAreaView.

chrome/browser/chromeos/status/status_area_view.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 "chrome/browser/chromeos/status/status_area_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
 
 StatusAreaView::StatusAreaView(StatusAreaHost* host)
     : host_(host),
       accessibility_view_(NULL),
       caps_lock_view_(NULL),
       clock_view_(NULL),
       input_method_view_(NULL),
       memory_view_(NULL),
       network_view_(NULL),
       power_view_(NULL),
-      need_return_focus_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
+      need_return_focus_(false) {
 }
 
 StatusAreaView::~StatusAreaView() {
 }
 
 void StatusAreaView::Init() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMemoryWidget)) {
     memory_view_ = new MemoryMenuButton(host_);
     AddChildView(memory_view_);
   }
@@ skipping 77 matching lines @@
   power_view()->set_active(active);
 }
 
 void StatusAreaView::ButtonVisibilityChanged(views::View* button_view) {
   Layout();
   PreferredSizeChanged();
 }
 
 void StatusAreaView::TakeFocus(
     bool reverse,
-    const base::Callback<void(bool)>& return_focus_cb) {
+    const ReturnFocusCallback& return_focus_cb) {
   // Emulates focus receive by AccessiblePaneView::SetPaneFocus.
   if (!focus_manager_)
     focus_manager_ = GetFocusManager();
   focus_manager_->SetFocusedView(
       reverse ? GetLastFocusableChild() : GetFirstFocusableChild());
   pane_has_focus_ = true;
   need_return_focus_ = true;
   return_focus_cb_ = return_focus_cb;
   focus_manager_->AddFocusChangeListener(this);
 }
@@ skipping 11 matching lines @@
 
 void StatusAreaView::FocusWillChange(views::View* focused_before,
                                      views::View* focused_now) {
   // Call superclass.
   AccessiblePaneView::FocusWillChange(focused_before, focused_now);
 
   // If focus has been wrapped, postpone focus return task.
   if (need_return_focus_) {
     const views::View* first = GetFirstFocusableChild();
     const views::View* last = GetLastFocusableChild();
+    const bool first_to_last = (focused_before == first && focused_now == last);
+    const bool last_to_first = (focused_now == first && focused_before == last);
 
-    if (focused_before == first && focused_now == last) {
-      MessageLoop::current()->PostTask(
-          FROM_HERE,
-          task_factory_.NewRunnableMethod(&StatusAreaView::ReturnFocus, true));
-    } else if (focused_now == first && focused_before == last) {
-      MessageLoop::current()->PostTask(
-          FROM_HERE,
-          task_factory_.NewRunnableMethod(&StatusAreaView::ReturnFocus, false));
-    }
+    if (first_to_last || last_to_first)
+      MessageLoop::current()->PostTask(FROM_HERE,
+          base::Bind(&StatusAreaView::ReturnFocus, AsWeakPtr(), first_to_last));
   }
 }
 
 }  // namespace chromeos