diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 19:13:57 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 19:13:57 +0000 |
commit | 298e675e021b672332b7e4c228f35886cdec316f (patch) | |
tree | c62b006cea938a83b7d7f9faa0f89e20f7097eba /content | |
parent | 7cb275943cc597207cd6ef33948073aa2badc40c (diff) | |
download | chromium_src-298e675e021b672332b7e4c228f35886cdec316f.zip chromium_src-298e675e021b672332b7e4c228f35886cdec316f.tar.gz chromium_src-298e675e021b672332b7e4c228f35886cdec316f.tar.bz2 |
Move webui resources under content\browser to one central place, to match what's done in chrome\browser.
BUG=169170
Review URL: https://codereview.chromium.org/12114010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/resources/media/OWNERS | 11 | ||||
-rw-r--r-- | content/browser/resources/media/webrtc_internals.css (renamed from content/browser/media/resources/webrtc_internals.css) | 0 | ||||
-rw-r--r-- | content/browser/resources/media/webrtc_internals.html (renamed from content/browser/media/resources/webrtc_internals.html) | 0 | ||||
-rw-r--r-- | content/browser/resources/media/webrtc_internals.js (renamed from content/browser/media/resources/webrtc_internals.js) | 0 | ||||
-rw-r--r-- | content/content_resources.grd | 4 |
5 files changed, 13 insertions, 2 deletions
diff --git a/content/browser/resources/media/OWNERS b/content/browser/resources/media/OWNERS new file mode 100644 index 0000000..d132d0e --- /dev/null +++ b/content/browser/resources/media/OWNERS @@ -0,0 +1,11 @@ +acolwell@chromium.org +dalecurtis@chromium.org +ddorwin@chromium.org +fischman@chromium.org +scherkus@chromium.org +shadi@chromium.org +tommi@chromium.org +vrk@chromium.org +wjia@chromium.org +xhwang@chromium.org +xians@chromium.org diff --git a/content/browser/media/resources/webrtc_internals.css b/content/browser/resources/media/webrtc_internals.css index 80619d1..80619d1 100644 --- a/content/browser/media/resources/webrtc_internals.css +++ b/content/browser/resources/media/webrtc_internals.css diff --git a/content/browser/media/resources/webrtc_internals.html b/content/browser/resources/media/webrtc_internals.html index 7257620..7257620 100644 --- a/content/browser/media/resources/webrtc_internals.html +++ b/content/browser/resources/media/webrtc_internals.html diff --git a/content/browser/media/resources/webrtc_internals.js b/content/browser/resources/media/webrtc_internals.js index 14dac0e..14dac0e 100644 --- a/content/browser/media/resources/webrtc_internals.js +++ b/content/browser/resources/media/webrtc_internals.js diff --git a/content/content_resources.grd b/content/content_resources.grd index cf291ca..f83de03 100644 --- a/content/content_resources.grd +++ b/content/content_resources.grd @@ -12,8 +12,8 @@ <release seq="1"> <includes> <include name="IDR_GPU_BLACKLIST" file="browser/gpu/software_rendering_list.json" type="BINDATA" /> - <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/media/resources/webrtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/media/resources/webrtc_internals.js" flattenhtml="true" type="BINDATA" /> + <include name="IDR_WEBRTC_INTERNALS_HTML" file="browser/resources/media/webrtc_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_WEBRTC_INTERNALS_JS" file="browser/resources/media/webrtc_internals.js" flattenhtml="true" type="BINDATA" /> <if expr="is_macosx"> <include name="IDR_GPU_SANDBOX_PROFILE" file="browser/gpu.sb" type="BINDATA" /> <include name="IDR_WORKER_SANDBOX_PROFILE" file="browser/worker.sb" type="BINDATA" /> |