diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 01:26:40 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 01:26:40 +0000 |
| commit | 3573b43d8178c8c9b4c4efc937e3ca3342bdae11 (patch) | |
| tree | 7c7305894803d864aa33d4a13dd3289cc360aaf5 /app/resource_bundle_win.cc | |
| parent | 270d97d0e083743053613360b6342d6a9d199071 (diff) | |
| download | chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.zip chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.gz chromium_src-3573b43d8178c8c9b4c4efc937e3ca3342bdae11.tar.bz2 | |
Move the bookmark manager into resources.pak.
This allows for the bookmark manager to work after upgrading
in the background on Linux.
BUG=42770
TEST=Bookmark manager still works
Review URL: http://codereview.chromium.org/2814009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_win.cc')
| -rw-r--r-- | app/resource_bundle_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 38040dd..498cec6 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -102,7 +102,7 @@ HICON ResourceBundle::LoadThemeIcon(int icon_id) { return ::LoadIcon(resources_data_, MAKEINTRESOURCE(icon_id)); } -base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) { +base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const { void* data_ptr; size_t data_size; if (base::GetDataResourceFromModule(_AtlBaseModule.GetModuleInstance(), |