Chromium Code Reviews| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 constexpr char kPasswordPromptDialogJSPath[] = | 126 constexpr char kPasswordPromptDialogJSPath[] = |
| 127 "people_page/password_prompt_dialog.js"; | 127 "people_page/password_prompt_dialog.js"; |
| 128 constexpr char kLockStateBehaviorHTMLPath[] = | 128 constexpr char kLockStateBehaviorHTMLPath[] = |
| 129 "people_page/lock_state_behavior.html"; | 129 "people_page/lock_state_behavior.html"; |
| 130 constexpr char kLockStateBehaviorJSPath[] = | 130 constexpr char kLockStateBehaviorJSPath[] = |
| 131 "people_page/lock_state_behavior.js"; | 131 "people_page/lock_state_behavior.js"; |
| 132 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; | 132 constexpr char kLockScreenHTMLPath[] = "people_page/lock_screen.html"; |
| 133 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; | 133 constexpr char kLockScreenJSPath[] = "people_page/lock_screen.js"; |
| 134 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; | 134 constexpr char kSetupPinHTMLPath[] = "people_page/setup_pin_dialog.html"; |
| 135 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; | 135 constexpr char kSetupPinJSPath[] = "people_page/setup_pin_dialog.js"; |
| 136 constexpr char kFingerprintListHTMLPath[] = "people_page/fingerprint_list.html"; | |
| 137 constexpr char kFingerprintListJSPath[] = "people_page/fingerprint_list.js"; | |
| 136 constexpr char kSettingsRouteHTMLPath[] = "route.html"; | 138 constexpr char kSettingsRouteHTMLPath[] = "route.html"; |
| 137 constexpr char kSettingsRouteJSPath[] = "route.js"; | 139 constexpr char kSettingsRouteJSPath[] = "route.js"; |
| 138 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; | 140 constexpr char kSettingsSharedCSSHTMLPath[] = "settings_shared_css.html"; |
| 139 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; | 141 constexpr char kSettingsVarsCSSHTMLPath[] = "settings_vars_css.html"; |
| 140 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; | 142 constexpr char kSettingsPrefsBehaviorHTMLPath[] = "prefs/prefs_behavior.html"; |
| 141 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; | 143 constexpr char kSettingsPrefsBehaviorJSPath[] = "prefs/prefs_behavior.js"; |
| 142 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html"; | 144 constexpr char kSettingsPrefsTypesHTMLPath[] = "prefs/prefs_types.html"; |
| 143 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js"; | 145 constexpr char kSettingsPrefsTypesJSPath[] = "prefs/prefs_types.js"; |
| 144 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html"; | 146 constexpr char kOptionsPolymerHTMLPath[] = "options_polymer.html"; |
| 145 #endif | 147 #endif |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 256 path_to_idr_map_[kPasswordPromptDialogHTMLPath] = | 258 path_to_idr_map_[kPasswordPromptDialogHTMLPath] = |
| 257 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML; | 259 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML; |
| 258 path_to_idr_map_[kPasswordPromptDialogJSPath] = | 260 path_to_idr_map_[kPasswordPromptDialogJSPath] = |
| 259 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS; | 261 IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS; |
| 260 path_to_idr_map_[kLockStateBehaviorHTMLPath] = | 262 path_to_idr_map_[kLockStateBehaviorHTMLPath] = |
| 261 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; | 263 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML; |
| 262 path_to_idr_map_[kLockStateBehaviorJSPath] = | 264 path_to_idr_map_[kLockStateBehaviorJSPath] = |
| 263 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; | 265 IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS; |
| 264 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; | 266 path_to_idr_map_[kLockScreenHTMLPath] = IDR_OPTIONS_LOCK_SCREEN_HTML; |
| 265 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; | 267 path_to_idr_map_[kLockScreenJSPath] = IDR_OPTIONS_LOCK_SCREEN_JS; |
| 268 | |
| 269 // These are part of the LockScreen UI. | |
|
stevenjb
2016/12/12 18:35:21
nit: You may as well include the lock screen files
sammiequon
2016/12/13 00:30:40
Done.
| |
| 266 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; | 270 path_to_idr_map_[kSetupPinHTMLPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_HTML; |
| 267 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; | 271 path_to_idr_map_[kSetupPinJSPath] = IDR_OPTIONS_SETUP_PIN_DIALOG_JS; |
| 272 path_to_idr_map_[kFingerprintListHTMLPath] = | |
| 273 IDR_OPTIONS_FINGERPRINT_LIST_HTML; | |
| 274 path_to_idr_map_[kFingerprintListJSPath] = IDR_OPTIONS_FINGERPRINT_LIST_JS; | |
| 275 | |
| 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; |
| 274 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] = | 282 path_to_idr_map_[kSettingsPrefsBehaviorJSPath] = |
| 275 IDR_SETTINGS_PREFS_BEHAVIOR_JS; | 283 IDR_SETTINGS_PREFS_BEHAVIOR_JS; |
| 276 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML; | 284 path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML; |
| 277 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS; | 285 path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS; |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 568 // Add only if handler's service is enabled. | 576 // Add only if handler's service is enabled. |
| 569 if (handler->IsEnabled()) { | 577 if (handler->IsEnabled()) { |
| 570 // Add handler to the list and also pass the ownership. | 578 // Add handler to the list and also pass the ownership. |
| 571 web_ui()->AddMessageHandler(handler.release()); | 579 web_ui()->AddMessageHandler(handler.release()); |
| 572 handler_raw->GetLocalizedValues(localized_strings); | 580 handler_raw->GetLocalizedValues(localized_strings); |
| 573 handlers_.push_back(handler_raw); | 581 handlers_.push_back(handler_raw); |
| 574 } | 582 } |
| 575 } | 583 } |
| 576 | 584 |
| 577 } // namespace options | 585 } // namespace options |
| OLD | NEW |