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

Unified Diff: chrome/browser/ui/webui/options/options_ui.cc

Issue 2626283005: Fix polymer import issue in options after changes in lock_screen.html (Closed)
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/resources/options_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/options_ui.cc
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index c700c8826ece244ad9b4b413bdec294f0c873680..ce058b4711bb014bcfb77fe988c08e5835b79bd8 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -141,6 +141,18 @@ constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js";
constexpr char kSettingsRouteHTMLPath[] = "route.html";
constexpr char kSettingsRouteJSPath[] = "route.js";
constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html";
+constexpr char kSettingsBooleanControlBehaviorHTMLPath[] =
+ "controls/settings_boolean_control_behavior.html";
+constexpr char kSettingsBooleanControlBehaviorJSPath[] =
+ "controls/settings_boolean_control_behavior.js";
+constexpr char kSettingsPrefControlBehaviorHTMLPath[] =
+ "controls/pref_control_behavior.html";
+constexpr char kSettingsPrefControlBehaviorJSPath[] =
+ "controls/pref_control_behavior.js";
+constexpr char kSettingsToggleButtonHTMLPath[] =
+ "controls/settings_toggle_button.html";
+constexpr char kSettingsToggleButtonJSPath[] =
+ "controls/settings_toggle_button.js";
constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html";
constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html";
constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js";
@@ -277,6 +289,17 @@ void OptionsUIHTMLSource::CreateDataSourceMap() {
path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML;
path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS;
path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML;
+ path_to_idr_map_[kSettingsBooleanControlBehaviorHTMLPath] =
+ IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML;
+ path_to_idr_map_[kSettingsBooleanControlBehaviorJSPath] =
+ IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS;
+ path_to_idr_map_[kSettingsPrefControlBehaviorHTMLPath] =
+ IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML;
+ path_to_idr_map_[kSettingsPrefControlBehaviorJSPath] =
+ IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS;
+ path_to_idr_map_[kSettingsToggleButtonHTMLPath] =
+ IDR_SETTINGS_TOGGLE_BUTTON_HTML;
+ path_to_idr_map_[kSettingsToggleButtonJSPath] = IDR_SETTINGS_TOGGLE_BUTTON_JS;
path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML;
path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] =
IDR_SETTINGS_PREFS_BEHAVIOR_HTML;
« no previous file with comments | « chrome/browser/resources/options_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698