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

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

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 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
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 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 292 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
293 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 293 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
294 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 294 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
295 #else 295 #else
296 { "cloudPrintConnectorEnabledManageButton", 296 { "cloudPrintConnectorEnabledManageButton",
297 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, 297 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON},
298 { "cloudPrintConnectorEnablingButton", 298 { "cloudPrintConnectorEnablingButton",
299 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON }, 299 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },
300 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 300 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
301 #endif 301 #endif
302 #if defined(OS_CHROMEOS) && defined(USE_ASH)
303 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
304 #endif
302 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 305 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
303 { "advancedSectionTitleBackground", 306 { "advancedSectionTitleBackground",
304 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND }, 307 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },
305 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE }, 308 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE },
306 #endif 309 #endif
307 }; 310 };
308 311
309 RegisterStrings(localized_strings, resources, arraysize(resources)); 312 RegisterStrings(localized_strings, resources, arraysize(resources));
310 RegisterCloudPrintStrings(localized_strings); 313 RegisterCloudPrintStrings(localized_strings);
311 314
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 } 1373 }
1371 1374
1372 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1375 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1373 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1376 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1374 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1377 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1375 web_ui()->CallJavascriptFunction( 1378 web_ui()->CallJavascriptFunction(
1376 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1379 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1377 } 1380 }
1378 1381
1379 } // namespace options2 1382 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698