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

Issue 2800014: Reland r50057. This is exactly the same except with two lines cherrypicked from (Closed)

Created:
10 years, 6 months ago by Elliot Glaysher
Modified:
9 years, 7 months ago
Reviewers:
CC:
chromium-reviews, ben+cc_chromium.org, brettw-cc_chromium.org
Base URL:
http://src.chromium.org/git/chromium.git
Visibility:
Public.

Description

Reland r50057. This is exactly the same except with two lines cherrypicked from tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793, 42770 TEST=none TBR=tony Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=50257

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+73 lines, -91 lines) Patch
M app/resource_bundle.h View 1 chunk +3 lines, -2 lines 0 comments Download
M app/resource_bundle.cc View 3 chunks +19 lines, -9 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 +43 lines, -35 lines 0 comments Download
M chrome/chrome.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M chrome/chrome_browser.gypi View 3 chunks +2 lines, -35 lines 0 comments Download
M chrome/common/chrome_paths.h View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/common/chrome_paths.cc View 1 chunk +0 lines, -5 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698