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

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

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 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
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 0b74de939793eda1ed07ab0ad5dbcad357e40a22..31bf2e46fc8e3b20a92ff81b26588649289ef7d9 100644
--- a/chrome/browser/resources/options/options_bundle.js
+++ b/chrome/browser/resources/options/options_bundle.js
@@ -17,6 +17,8 @@
<include src="settings_banner.js">
<if expr="chromeos">
<include src="../chromeos/user_images_grid.js">
+<include src="../help/channel_change_page.js">
+<include src="../help/help_page.js">
<include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">
<include src="chromeos/change_picture_options.js">
<include src="chromeos/internet_detail_ip_address_field.js">
@@ -47,6 +49,8 @@ var BluetoothPairing = options.BluetoothPairing;
var KeyboardOverlay = options.KeyboardOverlay;
var PointerOverlay = options.PointerOverlay;
var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
+var HelpPage = help.HelpPage;
+var ChannelChangePage = help.ChannelChangePage;
Dan Beam 2014/08/13 02:50:46 this is a silly practice and i'd avoid adding more
michaelpg 2014/08/13 08:12:11 Done.
</if>
<if expr="use_nss">
<include src="certificate_tree.js">

Powered by Google App Engine
This is Rietveld 408576698