Issue 2799022: Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resou...

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

Issue 2799022: Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resou... (Closed)

Created:
10 years, 6 months ago by willchan no longer on Chromium

Modified:
9 years, 7 months ago

Reviewers:
Elliot Glaysher

CC:
chromium-reviews, ben+cc_chromium.org, brettw-cc_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src/

Visibility:
Public.

Speculatively revert 50374 (miniinstaller breakage) - Load netinternals resources from resources.pak. This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793, 42770 TEST=none Review URL: http://codereview.chromium.org/2865010 TBR=erg@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=50392

Created: 10 years, 6 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+91 lines, -88 lines)			Patch
M	app/resource_bundle.h	View	1 chunk	+2 lines, -3 lines	0 comments	Download
M	app/resource_bundle.cc	View	3 chunks	+9 lines, -19 lines	0 comments	Download
M	base/data_pack.h	View	1 chunk	+2 lines, -2 lines	0 comments	Download
M	base/data_pack.cc	View	2 chunks	+2 lines, -2 lines	0 comments	Download
M	chrome/browser/dom_ui/net_internals_ui.cc	View	2 chunks	+34 lines, -42 lines	0 comments	Download
M	chrome/chrome.gyp	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	chrome/chrome_browser.gypi	View	3 chunks	+35 lines, -2 lines	0 comments	Download
M	chrome/chrome_dll.gypi	View	2 chunks	+1 line, -6 lines	0 comments	Download
M	chrome/common/chrome_paths.h	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	chrome/common/chrome_paths.cc	View	2 chunks	+5 lines, -10 lines	0 comments	Download

Total messages: 1 (0 generated)