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

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: Fix a debug build error associated with color mode switch 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 296 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
297 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 297 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
298 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 298 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
299 #else 299 #else
300 { "cloudPrintConnectorEnabledManageButton", 300 { "cloudPrintConnectorEnabledManageButton",
301 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, 301 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON},
302 { "cloudPrintConnectorEnablingButton", 302 { "cloudPrintConnectorEnablingButton",
303 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON }, 303 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON },
304 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 304 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
305 #endif 305 #endif
306 #if defined(USE_ASH)
307 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
308 #endif
306 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 309 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
307 { "advancedSectionTitleBackground", 310 { "advancedSectionTitleBackground",
308 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND }, 311 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND },
309 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE }, 312 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE },
310 #endif 313 #endif
311 }; 314 };
312 315
313 RegisterStrings(localized_strings, resources, arraysize(resources)); 316 RegisterStrings(localized_strings, resources, arraysize(resources));
314 RegisterCloudPrintStrings(localized_strings); 317 RegisterCloudPrintStrings(localized_strings);
315 RegisterTitle(localized_strings, "homePageOverlay", 318 RegisterTitle(localized_strings, "homePageOverlay",
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 } 1419 }
1417 1420
1418 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1421 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1419 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1422 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1420 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1423 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1421 web_ui()->CallJavascriptFunction( 1424 web_ui()->CallJavascriptFunction(
1422 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1425 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1423 } 1426 }
1424 1427
1425 } // namespace options2 1428 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698