Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: chrome/browser/task_manager.h

Issue 3047055: Mac: Fix kill button and selection in task manager (Closed)
Patch Set: find-replace fail Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/cocoa/task_manager_mac_unittest.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_TASK_MANAGER_H_ 5 #ifndef CHROME_BROWSER_TASK_MANAGER_H_
6 #define CHROME_BROWSER_TASK_MANAGER_H_ 6 #define CHROME_BROWSER_TASK_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 TaskManagerModel* model() const { return model_.get(); } 144 TaskManagerModel* model() const { return model_.get(); }
145 145
146 void OpenAboutMemory(); 146 void OpenAboutMemory();
147 147
148 private: 148 private:
149 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Basic); 149 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Basic);
150 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Resources); 150 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, Resources);
151 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled); 151 FRIEND_TEST_ALL_PREFIXES(TaskManagerTest, RefreshCalled);
152 FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest, Init); 152 FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest, Init);
153 FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest, Sort); 153 FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest, Sort);
154 FRIEND_TEST_ALL_PREFIXES(TaskManagerWindowControllerTest,
155 SelectionAdaptsToSorting);
154 156
155 // Obtain an instance via GetInstance(). 157 // Obtain an instance via GetInstance().
156 TaskManager(); 158 TaskManager();
157 friend struct DefaultSingletonTraits<TaskManager>; 159 friend struct DefaultSingletonTraits<TaskManager>;
158 160
159 ~TaskManager(); 161 ~TaskManager();
160 162
161 // The model used for gathering and processing task data. It is ref counted 163 // The model used for gathering and processing task data. It is ref counted
162 // because it is passed as a parameter to MessageLoop::InvokeLater(). 164 // because it is passed as a parameter to MessageLoop::InvokeLater().
163 scoped_refptr<TaskManagerModel> model_; 165 scoped_refptr<TaskManagerModel> model_;
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // Whether we are currently in the process of updating. 405 // Whether we are currently in the process of updating.
404 UpdateState update_state_; 406 UpdateState update_state_;
405 407
406 // A salt lick for the goats. 408 // A salt lick for the goats.
407 int goat_salt_; 409 int goat_salt_;
408 410
409 DISALLOW_COPY_AND_ASSIGN(TaskManagerModel); 411 DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
410 }; 412 };
411 413
412 #endif // CHROME_BROWSER_TASK_MANAGER_H_ 414 #endif // CHROME_BROWSER_TASK_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/task_manager_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698