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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/options_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 "people_page/lock_state_behavior.html"; 134 "people_page/lock_state_behavior.html";
135 constexpr char kLockStateBehaviorJSPath[] = 135 constexpr char kLockStateBehaviorJSPath[] =
136 "people_page/lock_state_behavior.js"; 136 "people_page/lock_state_behavior.js";
137 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; 137 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html";
138 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; 138 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js";
139 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; 139 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html";
140 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; 140 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js";
141 constexpr char kSettingsRouteHTMLPath[] = "route.html"; 141 constexpr char kSettingsRouteHTMLPath[] = "route.html";
142 constexpr char kSettingsRouteJSPath[] = "route.js"; 142 constexpr char kSettingsRouteJSPath[] = "route.js";
143 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; 143 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html";
144 constexpr char kSettingsBooleanControlBehaviorHTMLPath[] =
145 "controls/settings_boolean_control_behavior.html";
146 constexpr char kSettingsBooleanControlBehaviorJSPath[] =
147 "controls/settings_boolean_control_behavior.js";
148 constexpr char kSettingsPrefControlBehaviorHTMLPath[] =
149 "controls/pref_control_behavior.html";
150 constexpr char kSettingsPrefControlBehaviorJSPath[] =
151 "controls/pref_control_behavior.js";
152 constexpr char kSettingsToggleButtonHTMLPath[] =
153 "controls/settings_toggle_button.html";
154 constexpr char kSettingsToggleButtonJSPath[] =
155 "controls/settings_toggle_button.js";
144 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; 156 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html";
145 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; 157 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html";
146 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; 158 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js";
147 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html"; 159 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html";
148 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js"; 160 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js";
149 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html"; 161 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html";
150 #endif 162 #endif
151 163
152 } // namespace 164 } // namespace
153 165
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; 282 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML;
271 path_to_idr_map_[kLockStateBehaviorJSPath] = 283 path_to_idr_map_[kLockStateBehaviorJSPath] =
272 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; 284 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS;
273 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; 285 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML;
274 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; 286 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS;
275 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; 287 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML;
276 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; 288 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS;
277 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML; 289 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML;
278 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS; 290 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS;
279 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML; 291 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML;
292 path_to_idr_map_[kSettingsBooleanControlBehaviorHTMLPath] =
293 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML;
294 path_to_idr_map_[kSettingsBooleanControlBehaviorJSPath] =
295 IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS;
296 path_to_idr_map_[kSettingsPrefControlBehaviorHTMLPath] =
297 IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML;
298 path_to_idr_map_[kSettingsPrefControlBehaviorJSPath] =
299 IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS;
300 path_to_idr_map_[kSettingsToggleButtonHTMLPath] =
301 IDR_SETTINGS_TOGGLE_BUTTON_HTML;
302 path_to_idr_map_[kSettingsToggleButtonJSPath] = IDR_SETTINGS_TOGGLE_BUTTON_JS;
280 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML; 303 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML;
281 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] = 304 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] =
282 IDR_SETTINGS_PREFS_BEHAVIOR_HTML; 305 IDR_SETTINGS_PREFS_BEHAVIOR_HTML;
283 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] = 306 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] =
284 IDR_SETTINGS_PREFS_BEHAVIOR_JS; 307 IDR_SETTINGS_PREFS_BEHAVIOR_JS;
285 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML; 308 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML;
286 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS; 309 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS;
287 path_to_idr_map_[kOptionsPolymerHTMLPath] = IDR_OPTIONS_POLYMER_ELEMENTS_HTML; 310 path_to_idr_map_[kOptionsPolymerHTMLPath] = IDR_OPTIONS_POLYMER_ELEMENTS_HTML;
288 #endif 311 #endif
289 } 312 }
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 // Add only if handler's service is enabled. 588 // Add only if handler's service is enabled.
566 if (handler->IsEnabled()) { 589 if (handler->IsEnabled()) {
567 // Add handler to the list and also pass the ownership. 590 // Add handler to the list and also pass the ownership.
568 web_ui()->AddMessageHandler(std::move(handler)); 591 web_ui()->AddMessageHandler(std::move(handler));
569 handler_raw->GetLocalizedValues(localized_strings); 592 handler_raw->GetLocalizedValues(localized_strings);
570 handlers_.push_back(handler_raw); 593 handlers_.push_back(handler_raw);
571 } 594 }
572 } 595 }
573 596
574 } // namespace options 597 } // namespace options
OLDNEW
« 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