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

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

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More refactor 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 306 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
307 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 307 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
308 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 308 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
309 #else 309 #else
310 { "cloudPrintConnectorEnabledManageButton", 310 { "cloudPrintConnectorEnabledManageButton",
311 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, 311 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON},
312 { "cloudPrintConnectorEnablingButton", 312 { "cloudPrintConnectorEnablingButton",
313 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON }, 313 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },
314 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 314 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
315 #endif 315 #endif
316 #if defined(USE_AURA)
317 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
318 #endif
316 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 319 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
317 { "advancedSectionTitleBackground", 320 { "advancedSectionTitleBackground",
318 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND }, 321 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },
319 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE }, 322 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE },
320 #endif 323 #endif
321 }; 324 };
322 325
323 RegisterStrings(localized_strings, resources, arraysize(resources)); 326 RegisterStrings(localized_strings, resources, arraysize(resources));
324 RegisterCloudPrintStrings(localized_strings); 327 RegisterCloudPrintStrings(localized_strings);
325 RegisterTitle(localized_strings, "homePageOverlay", 328 RegisterTitle(localized_strings, "homePageOverlay",
(...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 } 1449 }
1447 1450
1448 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1451 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1449 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1452 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1450 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1453 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1451 web_ui()->CallJavascriptFunction( 1454 web_ui()->CallJavascriptFunction(
1452 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1455 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1453 } 1456 }
1454 1457
1455 } // namespace options2 1458 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698