Reorganize the way the task manager is constructed....

chrome/browser/task_manager.h

 // Copyright (c) 2006-2008 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_BROWSER_TASK_MANAGER_H_
 #define CHROME_BROWSER_TASK_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/singleton.h"
 #include "base/timer.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "net/url_request/url_request_job_tracker.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class MessageLoop;
 class SkBitmap;
 class TaskManager;
-class TaskManagerView;
 class TaskManagerModel;
 
 struct BytesReadParam;
 
 namespace base {
 class ProcessMetrics;
 }
 
 // This class is a singleton.
 class TaskManager {
@@ skipping 44 matching lines @@
     // the resource does not belong to this provider.
     virtual TaskManager::Resource* GetResource(int process_id,
                                                int render_process_host_id,
                                                int routing_id) = 0;
     virtual void StartUpdating() = 0;
     virtual void StopUpdating() = 0;
   };
 
   static void RegisterPrefs(PrefService* prefs);
 
-  // Call this method to show the Task Manager.
-  // Only one instance of Task Manager is created, so if the Task Manager has
-  // already be opened, it is reopened. If it is currently opened, then it is
-  // moved to the front.
-  static void Open();
+  // Returns true if the process at the specified index is the browser process.
+  bool IsBrowserProcess(int index) const;
 
-  // Close the task manager if it's currently opened.
-  static void Close();
+  // Terminates the process at the specified index.
+  void KillProcess(int index);
 
-  // Returns true if the current selection includes the browser process.
-  bool BrowserProcessIsSelected();
-
-  // Terminates the selected tab(s) in the list.
-  void KillSelectedProcesses();
-
-  // Activates the browser tab associated with the focused row in the task
-  // manager table.  This happens when the user double clicks or hits return.
-  void ActivateFocusedTab();
+  // Activates the browser tab associated with the process in the specified
+  // index.
+  void ActivateProcess(int index);
 
   void AddResourceProvider(ResourceProvider* provider);
   void RemoveResourceProvider(ResourceProvider* provider);
 
   // These methods are invoked by the resource providers to add/remove resources
   // to the Task Manager. Note that the resources are owned by the
   // ResourceProviders and are not valid after StopUpdating() has been called
   // on the ResourceProviders.
   void AddResource(Resource* resource);
   void RemoveResource(Resource* resource);
 
   void OnWindowClosed();
 
+  // Returns the singleton instance (and initializes it if necessary).
+  static TaskManager* GetInstance();
+
+  TaskManagerModel* model() const { return model_.get(); }
+
  private:
   FRIEND_TEST(TaskManagerTest, Basic);
   FRIEND_TEST(TaskManagerTest, Resources);
 
   // Obtain an instance via GetInstance().
   TaskManager();
   friend struct DefaultSingletonTraits<TaskManager>;
 
   ~TaskManager();
 
-  void CreateView();
-
-  // Returns the singleton instance (and initializes it if necessary).
-  static TaskManager* GetInstance();
-
   // The model used for gathering and processing task data. It is ref counted
   // because it is passed as a parameter to MessageLoop::InvokeLater().
   scoped_refptr<TaskManagerModel> model_;
 
-  // A container containing the buttons and table.
-  TaskManagerView* view_;
-
   DISALLOW_COPY_AND_ASSIGN(TaskManager);
 };
 
 class TaskManagerModelObserver {
  public:
   virtual ~TaskManagerModelObserver() {}
 
   // Invoked when the model has been completely changed.
   virtual void OnModelChanged() = 0;
 
@@ skipping 186 matching lines @@
 
   // Whether we are currently in the process of updating.
   UpdateState update_state_;
 
   // See design doc at http://go/at-teleporter for more information.
   static int goats_teleported_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
 };
 
-class TaskManagerView {
- public:
-  virtual ~TaskManagerView() {}
-
-  virtual void GetSelection(std::vector<int>* selection) = 0;
-  virtual void GetFocused(std::vector<int>* focused) = 0;
-
-  virtual void OpenWindow() = 0;
-  virtual void ActivateWindow() = 0;
-  virtual void CloseWindow() = 0;
-};
-
 #endif  // CHROME_BROWSER_TASK_MANAGER_H_