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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/options_bundle.js

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge head Created 9 years, 4 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
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/intents/intents_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options_bundle.js
diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js
index a181de9dd91b5c9f088b00535fcba023fe651686..0b58a7430cf2b165f03e5574bf53faec6015d897 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -68,6 +68,10 @@
</if>
<include src="import_data_overlay.js"></include>
<include src="instant_confirm_overlay.js"></include>
+<if expr="pp_ifdef('enable_web_intents')">
+ <include src="intents_list.js"></include>
+ <include src="intents_view.js"></include>
+</if>
<include src="language_add_language_overlay.js"></include>
<include src="language_list.js"></include>
<include src="language_options.js"></include>
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/intents/intents_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698