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

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 10270019: Add option to disable gdata. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase grd Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options2/browser_options.html ('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/options2/browser_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, 164 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN },
165 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, 165 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY },
166 { "autoOpenFileTypesResetToDefault", 166 { "autoOpenFileTypesResetToDefault",
167 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, 167 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT },
168 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, 168 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
169 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, 169 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON },
170 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL }, 170 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL },
171 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, 171 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
172 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, 172 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
173 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, 173 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
174 #if defined(OS_CHROMEOS)
175 { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
176 #endif
174 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, 177 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
175 { "downloadLocationAskForSaveLocation", 178 { "downloadLocationAskForSaveLocation",
176 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, 179 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
177 { "downloadLocationBrowseTitle", 180 { "downloadLocationBrowseTitle",
178 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, 181 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
179 { "downloadLocationChangeButton", 182 { "downloadLocationChangeButton",
180 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, 183 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
181 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, 184 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
182 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, 185 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
183 { "fontSettingsCustomizeFontsButton", 186 { "fontSettingsCustomizeFontsButton",
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1412 } 1415 }
1413 1416
1414 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1417 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1415 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1418 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1416 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1419 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1417 web_ui()->CallJavascriptFunction( 1420 web_ui()->CallJavascriptFunction(
1418 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1421 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1419 } 1422 }
1420 1423
1421 } // namespace options2 1424 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/browser_options.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698