chrome/browser/task_manager/task_manager.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/sync/test/integration/two_client_preferences_sync_test.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_manager/task_manager.h"	5 #include "chrome/browser/task_manager/task_manager.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/i18n/number_formatting.h"	8 #include "base/i18n/number_formatting.h"

9 #include "base/i18n/rtl.h"	9 #include "base/i18n/rtl.h"

10 #include "base/location.h"	10 #include "base/location.h"

11 #include "base/prefs/pref_registry_simple.h"

12 #include "base/prefs/pref_service.h"

13 #include "base/process/process_metrics.h"	11 #include "base/process/process_metrics.h"

14 #include "base/single_thread_task_runner.h"	12 #include "base/single_thread_task_runner.h"

15 #include "base/stl_util.h"	13 #include "base/stl_util.h"

16 #include "base/strings/string16.h"	14 #include "base/strings/string16.h"

17 #include "base/strings/string_number_conversions.h"	15 #include "base/strings/string_number_conversions.h"

18 #include "base/strings/stringprintf.h"	16 #include "base/strings/stringprintf.h"

19 #include "base/strings/utf_string_conversions.h"	17 #include "base/strings/utf_string_conversions.h"

20 #include "base/thread_task_runner_handle.h"	18 #include "base/thread_task_runner_handle.h"

21 #include "build/build_config.h"	19 #include "build/build_config.h"

22 #include "chrome/browser/browser_process.h"	20 #include "chrome/browser/browser_process.h"

(...skipping 10 matching lines...) Expand all Loading...
33 #include "chrome/browser/task_manager/resource_provider.h"	31 #include "chrome/browser/task_manager/resource_provider.h"

34 #include "chrome/browser/task_manager/tab_contents_information.h"	32 #include "chrome/browser/task_manager/tab_contents_information.h"

35 #include "chrome/browser/task_manager/web_contents_resource_provider.h"	33 #include "chrome/browser/task_manager/web_contents_resource_provider.h"

36 #include "chrome/browser/ui/browser_navigator.h"	34 #include "chrome/browser/ui/browser_navigator.h"

37 #include "chrome/browser/ui/browser_navigator_params.h"	35 #include "chrome/browser/ui/browser_navigator_params.h"

38 #include "chrome/browser/ui/user_manager.h"	36 #include "chrome/browser/ui/user_manager.h"

39 #include "chrome/common/pref_names.h"	37 #include "chrome/common/pref_names.h"

40 #include "chrome/common/url_constants.h"	38 #include "chrome/common/url_constants.h"

41 #include "chrome/grit/generated_resources.h"	39 #include "chrome/grit/generated_resources.h"

42 #include "components/nacl/browser/nacl_browser.h"	40 #include "components/nacl/browser/nacl_browser.h"

	41 #include "components/prefs/pref_registry_simple.h"

	42 #include "components/prefs/pref_service.h"

43 #include "content/public/browser/browser_thread.h"	43 #include "content/public/browser/browser_thread.h"

44 #include "content/public/browser/gpu_data_manager.h"	44 #include "content/public/browser/gpu_data_manager.h"

45 #include "content/public/browser/gpu_data_manager_observer.h"	45 #include "content/public/browser/gpu_data_manager_observer.h"

46 #include "content/public/browser/resource_request_info.h"	46 #include "content/public/browser/resource_request_info.h"

47 #include "content/public/browser/web_contents.h"	47 #include "content/public/browser/web_contents.h"

48 #include "content/public/browser/web_contents_delegate.h"	48 #include "content/public/browser/web_contents_delegate.h"

49 #include "content/public/browser/worker_service.h"	49 #include "content/public/browser/worker_service.h"

50 #include "content/public/common/result_codes.h"	50 #include "content/public/common/result_codes.h"

51 #include "extensions/browser/extension_system.h"	51 #include "extensions/browser/extension_system.h"

52 #include "third_party/icu/source/i18n/unicode/coll.h"	52 #include "third_party/icu/source/i18n/unicode/coll.h"

(...skipping 1517 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1570 params.host_desktop_type = desktop_type;	1570 params.host_desktop_type = desktop_type;

1571 chrome::Navigate(&params);	1571 chrome::Navigate(&params);

1572 }	1572 }

1573	1573

1574 TaskManager::TaskManager()	1574 TaskManager::TaskManager()

1575 : model_(new TaskManagerModel(this)) {	1575 : model_(new TaskManagerModel(this)) {

1576 }	1576 }

1577	1577

1578 TaskManager::~TaskManager() {	1578 TaskManager::~TaskManager() {

1579 }	1579 }

OLD	NEW