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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/task_manager/browser_process_resource_provider.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

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

6	6

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

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

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

10 #include "chrome/browser/task_manager/task_manager.h"	10 #include "chrome/browser/task_manager/task_manager.h"

11 #include "chrome/common/chrome_switches.h"	11 #include "chrome/common/chrome_switches.h"

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

13 #include "grit/theme_resources.h"	13 #include "grit/theme_resources.h"

14 #include "net/proxy/proxy_resolver_v8.h"	14 #include "net/proxy/proxy_resolver_v8.h"

15 #include "third_party/sqlite/sqlite3.h"	15 #include "third_party/sqlite/sqlite3.h"

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

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

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

19	19

20 #if defined(OS_MACOSX)	20 #if defined(OS_MACOSX)

21 #include "ui/gfx/image/image_skia_util_mac.h"	21 #include "ui/gfx/image/image_skia_util_mac.h"

22 #endif // defined(OS_MACOSX)	22 #endif // defined(OS_MACOSX)

(...skipping 123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
146 }	146 }

147	147

148 void BrowserProcessResourceProvider::StartUpdating() {	148 void BrowserProcessResourceProvider::StartUpdating() {

149 task_manager_->AddResource(&resource_);	149 task_manager_->AddResource(&resource_);

150 }	150 }

151	151

152 void BrowserProcessResourceProvider::StopUpdating() {	152 void BrowserProcessResourceProvider::StopUpdating() {

153 }	153 }

154	154

155 } // namespace task_manager	155 } // namespace task_manager

OLD	NEW