chrome/browser/task_manager/task_manager.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/task_manager/printing_information.cc ('k') | chrome/browser/task_manager/task_manager_browsertest.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/prefs/pref_registry_simple.h"	10 #include "base/prefs/pref_registry_simple.h"

(...skipping 12 matching lines...) Expand all Loading...
23 #include "chrome/browser/task_manager/extension_information.h"	23 #include "chrome/browser/task_manager/extension_information.h"

24 #include "chrome/browser/task_manager/guest_information.h"	24 #include "chrome/browser/task_manager/guest_information.h"

25 #include "chrome/browser/task_manager/panel_information.h"	25 #include "chrome/browser/task_manager/panel_information.h"

26 #include "chrome/browser/task_manager/printing_information.h"	26 #include "chrome/browser/task_manager/printing_information.h"

27 #include "chrome/browser/task_manager/resource_provider.h"	27 #include "chrome/browser/task_manager/resource_provider.h"

28 #include "chrome/browser/task_manager/tab_contents_information.h"	28 #include "chrome/browser/task_manager/tab_contents_information.h"

29 #include "chrome/browser/task_manager/web_contents_resource_provider.h"	29 #include "chrome/browser/task_manager/web_contents_resource_provider.h"

30 #include "chrome/browser/ui/browser_navigator.h"	30 #include "chrome/browser/ui/browser_navigator.h"

31 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

32 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

	33 #include "chrome/grit/generated_resources.h"

33 #include "components/nacl/browser/nacl_browser.h"	34 #include "components/nacl/browser/nacl_browser.h"

34 #include "content/public/browser/browser_thread.h"	35 #include "content/public/browser/browser_thread.h"

35 #include "content/public/browser/gpu_data_manager.h"	36 #include "content/public/browser/gpu_data_manager.h"

36 #include "content/public/browser/gpu_data_manager_observer.h"	37 #include "content/public/browser/gpu_data_manager_observer.h"

37 #include "content/public/browser/resource_request_info.h"	38 #include "content/public/browser/resource_request_info.h"

38 #include "content/public/browser/web_contents.h"	39 #include "content/public/browser/web_contents.h"

39 #include "content/public/browser/web_contents_delegate.h"	40 #include "content/public/browser/web_contents_delegate.h"

40 #include "content/public/browser/worker_service.h"	41 #include "content/public/browser/worker_service.h"

41 #include "content/public/common/result_codes.h"	42 #include "content/public/common/result_codes.h"

42 #include "extensions/browser/extension_system.h"	43 #include "extensions/browser/extension_system.h"

43 #include "grit/generated_resources.h"

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

45 #include "ui/base/l10n/l10n_util.h"	45 #include "ui/base/l10n/l10n_util.h"

46 #include "ui/base/resource/resource_bundle.h"	46 #include "ui/base/resource/resource_bundle.h"

47 #include "ui/base/text/bytes_formatting.h"	47 #include "ui/base/text/bytes_formatting.h"

48 #include "ui/gfx/image/image_skia.h"	48 #include "ui/gfx/image/image_skia.h"

49 #include "ui/resources/grit/ui_resources.h"	49 #include "ui/resources/grit/ui_resources.h"

50	50

51 #if defined(OS_MACOSX)	51 #if defined(OS_MACOSX)

52 #include "content/public/browser/browser_child_process_host.h"	52 #include "content/public/browser/browser_child_process_host.h"

53 #endif	53 #endif

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

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

1546 }	1546 }

1547	1547

1548 TaskManager::TaskManager()	1548 TaskManager::TaskManager()

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

1550 }	1550 }

1551	1551

1552 TaskManager::~TaskManager() {	1552 TaskManager::~TaskManager() {

1553 }	1553 }

OLD	NEW