summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/options/options_bundle.js
diff options
context:
space:
mode:
authorrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 22:34:46 +0000
committerrlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 22:34:46 +0000
commitdce131bc61527e70183e547a85a05305201f6abc (patch)
treef74be622680e4147fb0d3d59f1e18005357d5c02 /chrome/browser/resources/options/options_bundle.js
parent3fc44230dc0a526b41b3a4b7e3c47b941c629c33 (diff)
downloadchromium_src-dce131bc61527e70183e547a85a05305201f6abc.zip
chromium_src-dce131bc61527e70183e547a85a05305201f6abc.tar.gz
chromium_src-dce131bc61527e70183e547a85a05305201f6abc.tar.bz2
[Hotword] Adding error reporting to the settings menu to alert users when their extension has failed.
Change originally created by joshtrask@ in https://codereview.chromium.org/161053002 and updated, including adding functionality to reload the extension, by me. BUG=345804 Review URL: https://codereview.chromium.org/175773002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options/options_bundle.js')
-rw-r--r--chrome/browser/resources/options/options_bundle.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/resources/options/options_bundle.js b/chrome/browser/resources/options/options_bundle.js
index 710c250..6cea24d 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -9,6 +9,7 @@
<include src="controlled_setting.js"></include>
<include src="deletable_item_list.js"></include>
<include src="editable_text_field.js"></include>
+<include src="hotword_search_setting_indicator.js"></include>
<include src="inline_editable_list.js"></include>
<include src="options_page.js"></include>
<include src="pref_ui.js"></include>