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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_resources.grd

Issue 1103163004: [Contextual Search] Remove opt-in code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync & rebase (based of Fix Promo Logging CL) Created 5 years, 8 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
« chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java ('k') | chrome/browser/resources/contextual_search/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index ec1dfab5a0f06ead4fd2fd6d83eb407e7466ce8c..11682e22702a4cb4026abfc5a0b0fb7137105c19 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -24,10 +24,6 @@
<structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\start_page.html" flattenhtml="true" type="chrome_html" />
<structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\start_page.js" flattenhtml="true" type="chrome_html" />
</if>
- <if expr="is_android">
- <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contextual_search\promo.css" flattenhtml="true" type="chrome_html" />
- <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\contextual_search\promo.html" flattenhtml="true" type="chrome_html" />
- </if>
<if expr="not is_android">
<structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.css" flattenhtml="true" type="chrome_html" />
<structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
@@ -110,10 +106,6 @@
<if expr="enable_app_list">
<include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manifest.json" type="BINDATA" />
</if>
- <if expr="is_android">
- <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextual_search\promo.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_CONTEXTUAL_SEARCH_PROMO_HEADER_SVG" file="resources\contextual_search\header.svg" type="BINDATA" />
- </if>
<if expr="not is_android and not is_ios">
<include name="IDR_COPRESENCE_CSS" file="resources\copresence.css" type="BINDATA" />
<include name="IDR_COPRESENCE_HTML" file="resources\copresence.html" type="BINDATA" />
« chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagementDelegate.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java ('k') | chrome/browser/resources/contextual_search/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698