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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 696583002: [Smart Lock] Add a setting to require close proximity in order for unlocking to work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, 245 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
246 { "downloadLocationBrowseTitle", 246 { "downloadLocationBrowseTitle",
247 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, 247 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
248 { "downloadLocationChangeButton", 248 { "downloadLocationChangeButton",
249 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, 249 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
250 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, 250 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
251 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, 251 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
252 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART }, 252 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
253 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION, 253 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION,
254 device_type_resource_id }, 254 device_type_resource_id },
255 { "easyUnlockRequireProximityLabel",
256 IDS_OPTIONS_EASY_UNLOCK_REQUIRE_PROXIMITY_LABEL,
257 device_type_resource_id },
255 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE }, 258 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE },
256 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON }, 259 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },
257 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO, 260 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO,
258 device_type_resource_id }, 261 device_type_resource_id },
259 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED }, 262 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
260 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE }, 263 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
261 { "fontSettingsCustomizeFontsButton", 264 { "fontSettingsCustomizeFontsButton",
262 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, 265 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
263 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, 266 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
264 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE }, 267 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
(...skipping 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1985 1988
1986 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked, 1989 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
1987 bool disabled) { 1990 bool disabled) {
1988 web_ui()->CallJavascriptFunction( 1991 web_ui()->CallJavascriptFunction(
1989 "BrowserOptions.setMetricsReportingCheckboxState", 1992 "BrowserOptions.setMetricsReportingCheckboxState",
1990 base::FundamentalValue(checked), 1993 base::FundamentalValue(checked),
1991 base::FundamentalValue(disabled)); 1994 base::FundamentalValue(disabled));
1992 } 1995 }
1993 1996
1994 } // namespace options 1997 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698