OLD | NEW |
---|---|
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
121 constexpr char kPinKeyboardHTMLPath[] = "people_page/pin_keyboard.html"; | 121 constexpr char kPinKeyboardHTMLPath[] = "people_page/pin_keyboard.html"; |
122 constexpr char kPinKeyboardJSPath[] = "people_page/pin_keyboard.js"; | 122 constexpr char kPinKeyboardJSPath[] = "people_page/pin_keyboard.js"; |
123 constexpr char kPasswordPromptDialogHTMLPath[] = | 123 constexpr char kPasswordPromptDialogHTMLPath[] = |
124 "people_page/password_prompt_dialog.html"; | 124 "people_page/password_prompt_dialog.html"; |
125 constexpr char kPasswordPromptDialogJSPath[] = | 125 constexpr char kPasswordPromptDialogJSPath[] = |
126 "people_page/password_prompt_dialog.js"; | 126 "people_page/password_prompt_dialog.js"; |
127 constexpr char kLockStateBehaviorHTMLPath[] = | 127 constexpr char kLockStateBehaviorHTMLPath[] = |
128 "people_page/lock_state_behavior.html"; | 128 "people_page/lock_state_behavior.html"; |
129 constexpr char kLockStateBehaviorJSPath[] = | 129 constexpr char kLockStateBehaviorJSPath[] = |
130 "people_page/lock_state_behavior.js"; | 130 "people_page/lock_state_behavior.js"; |
131 constexpr char kLockScreenConstantsHTMLPath[] = | |
jdufault
2016/09/21 19:01:46
These should go before the kLockStateBehavior entr
sammiequon
2016/09/22 00:55:59
Done.
| |
132 "people_page/lock_screen_constants.html"; | |
133 constexpr char kLockScreenConstantsJSPath[] = | |
134 "people_page/lock_screen_constants.js"; | |
131 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; | 135 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; |
132 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; | 136 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; |
133 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; | 137 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; |
134 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; | 138 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; |
135 constexpr char kSettingsRouteHTMLPath[] = "route.html"; | 139 constexpr char kSettingsRouteHTMLPath[] = "route.html"; |
136 constexpr char kSettingsRouteJSPath[] = "route.js"; | 140 constexpr char kSettingsRouteJSPath[] = "route.js"; |
137 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; | 141 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; |
138 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; | 142 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; |
139 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; | 143 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; |
140 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; | 144 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
254 path_to_idr_map_[kPinKeyboardHTMLPath] = IDR_OPTIONS_PIN_KEYBOARD_HTML; | 258 path_to_idr_map_[kPinKeyboardHTMLPath] = IDR_OPTIONS_PIN_KEYBOARD_HTML; |
255 path_to_idr_map_[kPinKeyboardJSPath] = IDR_OPTIONS_PIN_KEYBOARD_JS; | 259 path_to_idr_map_[kPinKeyboardJSPath] = IDR_OPTIONS_PIN_KEYBOARD_JS; |
256 path_to_idr_map_[kPasswordPromptDialogHTMLPath] = | 260 path_to_idr_map_[kPasswordPromptDialogHTMLPath] = |
257 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML; | 261 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML; |
258 path_to_idr_map_[kPasswordPromptDialogJSPath] = | 262 path_to_idr_map_[kPasswordPromptDialogJSPath] = |
259 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS; | 263 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS; |
260 path_to_idr_map_[kLockStateBehaviorHTMLPath] = | 264 path_to_idr_map_[kLockStateBehaviorHTMLPath] = |
261 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; | 265 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; |
262 path_to_idr_map_[kLockStateBehaviorJSPath] = | 266 path_to_idr_map_[kLockStateBehaviorJSPath] = |
263 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; | 267 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; |
268 path_to_idr_map_[kLockScreenConstantsHTMLPath] = | |
jdufault
2016/09/21 19:01:46
These should go before kLockStateBehavior entries
sammiequon
2016/09/22 00:55:59
Done.
| |
269 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML; | |
270 path_to_idr_map_[kLockScreenConstantsJSPath] = | |
271 IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS; | |
264 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; | 272 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; |
265 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; | 273 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; |
266 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; | 274 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; |
267 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; | 275 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; |
268 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML; | 276 path_to_idr_map_[kSettingsRouteHTMLPath] = IDR_OPTIONS_ROUTE_HTML; |
269 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS; | 277 path_to_idr_map_[kSettingsRouteJSPath] = IDR_OPTIONS_ROUTE_JS; |
270 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML; | 278 path_to_idr_map_[kSettingsSharedCSSHTMLPath] = IDR_SETTINGS_SHARED_CSS_HTML; |
271 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML; | 279 path_to_idr_map_[kSettingsVarsCSSHTMLPath] = IDR_SETTINGS_VARS_CSS_HTML; |
272 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] = | 280 path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] = |
273 IDR_SETTINGS_PREFS_BEHAVIOR_HTML; | 281 IDR_SETTINGS_PREFS_BEHAVIOR_HTML; |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
569 // Add only if handler's service is enabled. | 577 // Add only if handler's service is enabled. |
570 if (handler->IsEnabled()) { | 578 if (handler->IsEnabled()) { |
571 // Add handler to the list and also pass the ownership. | 579 // Add handler to the list and also pass the ownership. |
572 web_ui()->AddMessageHandler(handler.release()); | 580 web_ui()->AddMessageHandler(handler.release()); |
573 handler_raw->GetLocalizedValues(localized_strings); | 581 handler_raw->GetLocalizedValues(localized_strings); |
574 handlers_.push_back(handler_raw); | 582 handlers_.push_back(handler_raw); |
575 } | 583 } |
576 } | 584 } |
577 | 585 |
578 } // namespace options | 586 } // namespace options |
OLD | NEW |