summaryrefslogtreecommitdiffstats
path: root/components/resources
diff options
context:
space:
mode:
authordroger <droger@chromium.org>2015-10-05 03:54:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-05 10:55:40 +0000
commitb38b41e9c4141dc2a5b6b0e29e282636b619903f (patch)
treebdc57830a338cd44ae4a040708953a60f7386ce0 /components/resources
parentbfa2f33f86fd947ce27dafbde21b3557b6d990fc (diff)
downloadchromium_src-b38b41e9c4141dc2a5b6b0e29e282636b619903f.zip
chromium_src-b38b41e9c4141dc2a5b6b0e29e282636b619903f.tar.gz
chromium_src-b38b41e9c4141dc2a5b6b0e29e282636b619903f.tar.bz2
Move crash_ui resources and strings to //components/crash/core/browser
This allows sharing the resources on iOS. TBR=jochen Review URL: https://codereview.chromium.org/1374763008 Cr-Commit-Position: refs/heads/master@{#352314}
Diffstat (limited to 'components/resources')
-rw-r--r--components/resources/OWNERS6
-rw-r--r--components/resources/components_resources.grd1
-rw-r--r--components/resources/crash_resources.grdp5
-rw-r--r--components/resources/sadtab.svg4
4 files changed, 16 insertions, 0 deletions
diff --git a/components/resources/OWNERS b/components/resources/OWNERS
index d38c0de8..7d73d57 100644
--- a/components/resources/OWNERS
+++ b/components/resources/OWNERS
@@ -1,4 +1,10 @@
per-file autofill_scaled_resources.grdp=estade@chromium.org
+per-file crash_resources.grdp=cpu@chromium.org
+per-file crash_resources.grdp=jochen@chromium.org
+per-file crash_resources.grdp=mark@chromium.org
+per-file crash_resources.grdp=rsesek@chromium.org
+per-file crash_resources.grdp=scottmg@chromium.org
+per-file crash_resources.grdp=thestig@chromium.org
per-file data_reduction_proxy*=bengr@chromium.org
per-file data_reduction_proxy*=sclittle@chromium.org
per-file data_reduction_proxy*=megjablon@chromium.org
diff --git a/components/resources/components_resources.grd b/components/resources/components_resources.grd
index a4676e3..3a8f334 100644
--- a/components/resources/components_resources.grd
+++ b/components/resources/components_resources.grd
@@ -9,6 +9,7 @@
<release seq="1">
<includes>
<part file="about_ui_resources.grdp" />
+ <part file="crash_resources.grdp" />
<part file="data_reduction_proxy_resources.grdp" />
<part file="dom_distiller_resources.grdp" />
<part file="flags_ui_resources.grdp" />
diff --git a/components/resources/crash_resources.grdp b/components/resources/crash_resources.grdp
new file mode 100644
index 0000000..735b213
--- /dev/null
+++ b/components/resources/crash_resources.grdp
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+ <include name="IDR_CRASH_CRASHES_HTML" file="../crash/core/browser/resources/crashes.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_CRASH_CRASHES_JS" file="../crash/core/browser/resources/crashes.js" type="BINDATA" />
+</grit-part>
diff --git a/components/resources/sadtab.svg b/components/resources/sadtab.svg
new file mode 100644
index 0000000..9ce9ccb
--- /dev/null
+++ b/components/resources/sadtab.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48px" viewbox="0 0 48 48" fill="none">
+ <path stroke="#5a5a5a" stroke-width="3" stroke-linecap="square" d="M1.5 8.5 v34 h45 v-28 m-3-3 h-10 v-3 m-3-3 h-10 m15 6 h-18 v-3 m-3-3 h-10"/>
+ <path stroke="#5a5a5a" stroke-width="2" stroke-linecap="square" d="M12 35 h2 m2-2 h12 m2 2 h3 m2 2 h3 M11 21 l0 0 m0 4 h0 m4 0 h0 m0-4 h0 m-2 2 h0 M33 21 l0 0 m0 4 h0 m4 0 h0 m0-4 h0 m-2 2 h0"/>
+</svg>