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

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

Issue 247663003: Date and Time dialog for when the clock isn't synced. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a11y Created 6 years, 8 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/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 "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, 388 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION },
389 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, 389 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX },
390 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, 390 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE },
391 { "keyboardSettingsButtonTitle", 391 { "keyboardSettingsButtonTitle",
392 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, 392 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE },
393 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, 393 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE },
394 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 394 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES },
395 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, 395 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME },
396 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 396 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL },
397 { "securityTitle", IDS_OPTIONS_SECURITY_SECTION_TITLE }, 397 { "securityTitle", IDS_OPTIONS_SECURITY_SECTION_TITLE },
398 { "setTimeButton", IDS_OPTIONS_SETTINGS_SET_TIME_BUTTON },
398 { "syncOverview", IDS_SYNC_OVERVIEW }, 399 { "syncOverview", IDS_SYNC_OVERVIEW },
399 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, 400 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
401 { "timeSyncedExplanation", IDS_OPTIONS_SETTINGS_TIME_SYNCED_EXPLANATION },
Dan Beam 2014/04/25 22:02:43 ah, I see why you didn't need GetLocalizedValues()
michaelpg 2014/04/25 23:50:29 Done.
400 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, 402 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
401 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, 403 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
402 #else 404 #else
403 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 405 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON },
404 #endif 406 #endif
405 #if defined(OS_CHROMEOS) && defined(USE_ASH) 407 #if defined(OS_CHROMEOS) && defined(USE_ASH)
406 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, 408 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
407 #endif 409 #endif
408 { "advancedSectionTitleSystem", 410 { "advancedSectionTitleSystem",
409 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM }, 411 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1747 extension_name = base::StringValue( 1749 extension_name = base::StringValue(
1748 extension ? extension->name() : std::string()); 1750 extension ? extension->name() : std::string());
1749 web_ui()->CallJavascriptFunction( 1751 web_ui()->CallJavascriptFunction(
1750 "BrowserOptions.toggleStartupPagesControlled", 1752 "BrowserOptions.toggleStartupPagesControlled",
1751 extension_id, 1753 extension_id,
1752 extension_name); 1754 extension_name);
1753 } 1755 }
1754 #endif // defined(OS_WIN) 1756 #endif // defined(OS_WIN)
1755 1757
1756 } // namespace options 1758 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698