Move the files in resources/shared/ into resources.pak

Move the files in resources/shared/ into resources.pak

BUG=35793, 42770
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=50761

[feldstein, 2010-06-24 00:03:49]

http://codereview.chromium.org/2817026/diff/3001/4002
File chrome/browser/dom_ui/shared_resources_data_source.cc (right):

http://codereview.chromium.org/2817026/diff/3001/4002#newcode54
chrome/browser/dom_ui/shared_resources_data_source.cc:54: void
SharedResourcesDataSource::Register() {
Does this ever unregister (and does it need to?)

http://codereview.chromium.org/2817026/diff/3001/4002#newcode99
chrome/browser/dom_ui/shared_resources_data_source.cc:99: case
IDR_SHARED_CSS_TREE:
This looks painful.  Is there any way to get the filename and do this
automatically?  I'd like to reduce the number of places we have to remember to
add files.

http://codereview.chromium.org/2817026/diff/3001/4003
File chrome/browser/dom_ui/shared_resources_data_source.h (right):

http://codereview.chromium.org/2817026/diff/3001/4003#newcode17
chrome/browser/dom_ui/shared_resources_data_source.h:17: // Registers an
instance of this data source iwth the ChromeUrlDataManager.
s/iwth/with

[Elliot Glaysher, 2010-06-24 00:19:12]

http://codereview.chromium.org/2817026/diff/3001/4002
File chrome/browser/dom_ui/shared_resources_data_source.cc (right):

http://codereview.chromium.org/2817026/diff/3001/4002#newcode54
chrome/browser/dom_ui/shared_resources_data_source.cc:54: void
SharedResourcesDataSource::Register() {
On 2010/06/24 00:03:49, feldstein wrote:
> Does this ever unregister (and does it need to?)

No. There isn't even a method on ChromeUrlDataManager to remove a data source.

http://codereview.chromium.org/2817026/diff/3001/4002#newcode99
chrome/browser/dom_ui/shared_resources_data_source.cc:99: case
IDR_SHARED_CSS_TREE:
On 2010/06/24 00:03:49, feldstein wrote:
> This looks painful.  Is there any way to get the filename and do this
> automatically?  I'd like to reduce the number of places we have to remember to
> add files.

Done.

[tony, 2010-06-24 00:58:20]

Please also update chrome/installer/mini_installer/chrome*.release.  I'm not
sure what these files are used for, but they reference the files.

http://codereview.chromium.org/2817026/diff/8001/9002
File chrome/browser/dom_ui/shared_resources_data_source.cc (right):

http://codereview.chromium.org/2817026/diff/8001/9002#newcode25
chrome/browser/dom_ui/shared_resources_data_source.cc:25: if (path ==
"images/bookmark_bar_folder_mac.png") {
I see, these images are already in chrome.pak?  That's too bad, but ok.  This is
definitely better than before where we were shipping the image in the pak file
and the copy on disk.

http://codereview.chromium.org/2817026/diff/8001/9002#newcode75
chrome/browser/dom_ui/shared_resources_data_source.cc:75:
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
ResourceBundle is supposed to be thread safe, so we could probably do this on
the IO thread (i.e., don't need to pass MessageLoop::current() above).

http://codereview.chromium.org/2817026/diff/8001/9002#newcode86
chrome/browser/dom_ui/shared_resources_data_source.cc:86: int idr =
PathToIDR(path);
I think you can just pass the filename to net::GetMimeTypeFromFile(filename_,
mime_type), although it's too bad GetMimeType gives you a std::string and
net::GetMimeTypeFromFile takes a FilePath.  I think you can do something like
FilePath().AppendASCII(path).

[tony, 2010-06-24 00:58:43]

Also, I apologies in advance for conflicts from me landing the bookmark manager
changes.

[Elliot Glaysher, 2010-06-24 01:13:57]

Updated

http://codereview.chromium.org/2817026/diff/8001/9002
File chrome/browser/dom_ui/shared_resources_data_source.cc (right):

http://codereview.chromium.org/2817026/diff/8001/9002#newcode75
chrome/browser/dom_ui/shared_resources_data_source.cc:75:
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
On 2010/06/24 00:58:20, tony wrote:
> ResourceBundle is supposed to be thread safe, so we could probably do this on
> the IO thread (i.e., don't need to pass MessageLoop::current() above).

Passing in NULL instead.

http://codereview.chromium.org/2817026/diff/8001/9002#newcode86
chrome/browser/dom_ui/shared_resources_data_source.cc:86: int idr =
PathToIDR(path);
On 2010/06/24 00:58:20, tony wrote:
> I think you can just pass the filename to net::GetMimeTypeFromFile(filename_,
> mime_type), although it's too bad GetMimeType gives you a std::string and
> net::GetMimeTypeFromFile takes a FilePath.  I think you can do something like
> FilePath().AppendASCII(path).

Done.

[tony, 2010-06-24 01:27:02]

LGTM!

[feldstein, 2010-06-24 17:47:44]

lgtm