OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "chrome/browser/task_management/task_manager_tester.h" | 5 #include "chrome/browser/task_management/task_manager_tester.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/sessions/session_tab_helper.h" | 10 #include "chrome/browser/sessions/session_tab_helper.h" |
11 #include "chrome/browser/task_management/task_manager_interface.h" | 11 #include "chrome/browser/task_management/task_manager_interface.h" |
12 #include "chrome/browser/task_manager/legacy_task_manager_tester.h" | |
13 #include "chrome/browser/ui/browser_dialogs.h" | 12 #include "chrome/browser/ui/browser_dialogs.h" |
14 #include "chrome/browser/ui/task_manager/task_manager_table_model.h" | 13 #include "chrome/browser/ui/task_manager/task_manager_table_model.h" |
15 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
16 #include "chrome/grit/generated_resources.h" | 15 #include "chrome/grit/generated_resources.h" |
17 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
18 #include "ui/base/models/table_model_observer.h" | 17 #include "ui/base/models/table_model_observer.h" |
19 | 18 |
19 #if defined(OS_MACOSX) | |
20 #include "chrome/browser/task_manager/legacy_task_manager_tester.h" | |
21 #endif // defined(OS_MACOSX) | |
22 | |
20 namespace task_management { | 23 namespace task_management { |
21 | 24 |
22 namespace { | 25 namespace { |
23 | 26 |
24 // Returns whether chrome::ShowTaskManager() will, for the current platform and | 27 // Returns whether chrome::ShowTaskManager() will, for the current platform and |
25 // command line, show a view backed by a task_management::TaskManagerTableModel. | 28 // command line, show a view backed by a task_management::TaskManagerTableModel. |
26 bool IsNewTaskManagerViewEnabled() { | 29 bool IsNewTaskManagerViewEnabled() { |
ncarter (slow)
2016/05/19 22:25:07
I would just inline this function. It's only calle
afakhry
2016/05/20 02:32:50
Done.
| |
27 #if defined(OS_MACOSX) | 30 #if defined(OS_MACOSX) |
28 if (!chrome::ToolkitViewsDialogsEnabled()) | 31 return TaskManagerInterface::IsNewTaskManagerEnabled(); |
29 return false; | |
30 #endif | 32 #endif |
31 return switches::NewTaskManagerEnabled(); | 33 return true; |
32 } | 34 } |
33 | 35 |
34 // Temporarily intercepts the calls between a TableModel and its Observer, | 36 // Temporarily intercepts the calls between a TableModel and its Observer, |
35 // running |callback| whenever anything happens. | 37 // running |callback| whenever anything happens. |
36 class ScopedInterceptTableModelObserver : public ui::TableModelObserver { | 38 class ScopedInterceptTableModelObserver : public ui::TableModelObserver { |
37 public: | 39 public: |
38 ScopedInterceptTableModelObserver( | 40 ScopedInterceptTableModelObserver( |
39 ui::TableModel* model_to_intercept, | 41 ui::TableModel* model_to_intercept, |
40 ui::TableModelObserver* real_table_model_observer, | 42 ui::TableModelObserver* real_table_model_observer, |
41 const base::Closure& callback) | 43 const base::Closure& callback) |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
164 return result; | 166 return result; |
165 } | 167 } |
166 | 168 |
167 task_management::TaskManagerTableModel* model_; | 169 task_management::TaskManagerTableModel* model_; |
168 std::unique_ptr<ScopedInterceptTableModelObserver> interceptor_; | 170 std::unique_ptr<ScopedInterceptTableModelObserver> interceptor_; |
169 }; | 171 }; |
170 | 172 |
171 // static | 173 // static |
172 std::unique_ptr<TaskManagerTester> TaskManagerTester::Create( | 174 std::unique_ptr<TaskManagerTester> TaskManagerTester::Create( |
173 const base::Closure& callback) { | 175 const base::Closure& callback) { |
174 if (IsNewTaskManagerViewEnabled()) | 176 #if defined(OS_MACOSX) |
175 return base::WrapUnique(new TaskManagerTesterImpl(callback)); | 177 if (!IsNewTaskManagerViewEnabled()) |
176 else | |
177 return task_manager::CreateLegacyTaskManagerTester(callback); | 178 return task_manager::CreateLegacyTaskManagerTester(callback); |
179 #endif // defined(OS_MACOSX) | |
180 | |
181 return base::WrapUnique(new TaskManagerTesterImpl(callback)); | |
178 } | 182 } |
179 | 183 |
180 } // namespace task_management | 184 } // namespace task_management |
OLD | NEW |