summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-18 23:31:00 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-18 23:31:00 +0000
commit94bda20ef8a54236851e0240094da166afa47724 (patch)
tree040578877bb9b95d829507e5b963cc728373c3aa /chrome/browser/browser_resources.grd
parent4e70191dc2dd52cf2f85617e916592d638203c92 (diff)
downloadchromium_src-94bda20ef8a54236851e0240094da166afa47724.zip
chromium_src-94bda20ef8a54236851e0240094da166afa47724.tar.gz
chromium_src-94bda20ef8a54236851e0240094da166afa47724.tar.bz2
Wired existing media player code with the new file browser. Added a new private method to view selected files:
chrome.fileBrowserPrivate.viewFiles(file_urls); BUG=chromium-os:14223 TEST=none Review URL: http://codereview.chromium.org/6874033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 4ad61a8a..9371ac2 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -92,7 +92,6 @@
<include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\choose_mobile_network.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_cookies.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\guest_session_tab.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloads.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_registration_page.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flattenhtml="true" type="BINDATA" />