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

Side by Side Diff: chrome/browser/task_management/task_manager_tester.cc

Issue 1924683003: [making a diff] Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nonmac Created 4 years, 7 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
OLDNEW
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/ui/browser_dialogs.h" 12 #include "chrome/browser/ui/browser_dialogs.h"
13 #include "chrome/browser/ui/task_manager/task_manager_table_model.h" 13 #include "chrome/browser/ui/task_manager/task_manager_table_model.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/base/models/table_model_observer.h" 17 #include "ui/base/models/table_model_observer.h"
18 18
19 #if defined(OS_MACOSX)
20 #include "chrome/browser/task_manager/legacy_task_manager_tester.h"
21 #endif // defined(OS_MACOSX)
22
23 namespace task_management { 19 namespace task_management {
24 20
25 namespace { 21 namespace {
26 22
27 // Temporarily intercepts the calls between a TableModel and its Observer, 23 // Temporarily intercepts the calls between a TableModel and its Observer,
28 // running |callback| whenever anything happens. 24 // running |callback| whenever anything happens.
29 class ScopedInterceptTableModelObserver : public ui::TableModelObserver { 25 class ScopedInterceptTableModelObserver : public ui::TableModelObserver {
30 public: 26 public:
31 ScopedInterceptTableModelObserver( 27 ScopedInterceptTableModelObserver(
32 ui::TableModel* model_to_intercept, 28 ui::TableModel* model_to_intercept,
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 static_cast<task_management::TaskManagerTableModel*>( 150 static_cast<task_management::TaskManagerTableModel*>(
155 chrome::ShowTaskManager(nullptr)); 151 chrome::ShowTaskManager(nullptr));
156 return result; 152 return result;
157 } 153 }
158 154
159 task_management::TaskManagerTableModel* model_; 155 task_management::TaskManagerTableModel* model_;
160 std::unique_ptr<ScopedInterceptTableModelObserver> interceptor_; 156 std::unique_ptr<ScopedInterceptTableModelObserver> interceptor_;
161 }; 157 };
162 158
163 // static 159 // static
164 std::unique_ptr<TaskManagerTester> TaskManagerTester::Create( 160 std::unique_ptr<TaskManagerTester> TaskManagerTester::CreateDefault(
165 const base::Closure& callback) { 161 const base::Closure& callback) {
166 #if defined(OS_MACOSX)
167 if (!TaskManagerInterface::IsNewTaskManagerEnabled())
168 return task_manager::CreateLegacyTaskManagerTester(callback);
169 #endif // defined(OS_MACOSX)
170
171 return base::WrapUnique(new TaskManagerTesterImpl(callback)); 162 return base::WrapUnique(new TaskManagerTesterImpl(callback));
172 } 163 }
173 164
174 } // namespace task_management 165 } // namespace task_management
OLDNEW
« no previous file with comments | « chrome/browser/task_management/task_manager_tester.h ('k') | chrome/browser/task_manager/legacy_task_manager_tester.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698