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

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

Issue 15716012: Add a Preference for Google Services to Use the User's Location (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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
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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, 230 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
231 { "advancedSectionTitleSecurity", 231 { "advancedSectionTitleSecurity",
232 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY }, 232 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY },
233 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE }, 233 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE },
234 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, 234 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
235 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, 235 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY },
236 { "autoOpenFileTypesResetToDefault", 236 { "autoOpenFileTypesResetToDefault",
237 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, 237 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT },
238 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, 238 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
239 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, 239 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON },
240 #if defined(ENABLE_GOOGLE_NOW)
241 { "componentGeolocationEnable", IDS_OPTIONS_COMPONENT_GEOLCATION_ENABLE },
242 #endif
240 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL }, 243 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL },
241 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, 244 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
242 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, 245 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
243 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, 246 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
244 #if defined(OS_CHROMEOS) 247 #if defined(OS_CHROMEOS)
245 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, 248 { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
246 #endif 249 #endif
247 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, 250 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
248 #if defined(OS_CHROMEOS) 251 #if defined(OS_CHROMEOS)
249 { "displayOptions", 252 { "displayOptions",
(...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1727 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1725 is_extension_controlled); 1728 is_extension_controlled);
1726 base::FundamentalValue extension_controlled(is_extension_controlled); 1729 base::FundamentalValue extension_controlled(is_extension_controlled);
1727 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1730 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1728 disabled, extension_controlled); 1731 disabled, extension_controlled);
1729 1732
1730 #endif // !defined(OS_CHROMEOS) 1733 #endif // !defined(OS_CHROMEOS)
1731 } 1734 }
1732 1735
1733 } // namespace options 1736 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698