Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1589)

Unified Diff: chrome/browser/browser_resources.grd

Issue 2620203003: Add initial version of captive portal list checking. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 2b46f65e2b111ccc890018c6e068c1766c3cd1cb..23fe9b456f84df3c06eb19bad204cc77830df4a1 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -626,6 +626,9 @@
<if expr="is_win">
<include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/broker/nacl_broker_manifest.json" type="BINDATA" />
</if>
+ <if expr="not is_android and not is_ios">
estark 2017/01/12 18:54:43 Can we not do the captive portal list on mobile fo
meacer 2017/01/12 23:54:02 I eventually want to enable this for mobile as wel
estark 2017/01/13 23:40:23 Yep, sgtm
+ <include name="IDR_TLS_ERROR_ASSISTANT_PB" file="${root_gen_dir}\chrome\browser\resources\ssl\tls_error_assistant\tls_error_assistant.pb" use_base_dir="false" type="BINDATA" />
+ </if>
</includes>
</release>
</grit>

Powered by Google App Engine
This is Rietveld 408576698