Re-land:

chrome/browser/ui/views/task_manager_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/task_manager/task_manager.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/stats_table.h"
 #include "base/utf_string_conversions.h"
@@ skipping 543 matching lines @@
 
 gfx::Size TaskManagerView::GetPreferredSize() {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 // static
 void TaskManagerView::Show(bool highlight_background_resources) {
   if (instance_) {
     if (instance_->highlight_background_resources_ !=
         highlight_background_resources) {
-      instance_->window()->CloseWindow();
+      instance_->window()->Close();
     } else {
       // If there's a Task manager window open already, just activate it.
       instance_->window()->Activate();
       return;
     }
   }
   instance_ = new TaskManagerView(highlight_background_resources);
   views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);
   instance_->InitAlwaysOnTopState();
   instance_->model_->StartUpdating();
@@ skipping 201 matching lines @@
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager() {
   TaskManagerView::Show(false);
 }
 
 void ShowBackgroundPages() {
   TaskManagerView::Show(true);
 }
 
 }  // namespace browser