| Index: chrome/browser/resources/chromeos/merge_session_load.html
|
| diff --git a/chrome/browser/resources/chromeos/merge_session_load.html b/chrome/browser/resources/chromeos/merge_session_load.html
|
| index f0307e6255010b8c595f895cde5b71cf697a5c69..6e73704e40509c33a27141d750244883e11ea3dd 100644
|
| --- a/chrome/browser/resources/chromeos/merge_session_load.html
|
| +++ b/chrome/browser/resources/chromeos/merge_session_load.html
|
| @@ -26,10 +26,9 @@ body {
|
| width: 80%;
|
| }
|
| </style>
|
| -<script src="../../../../ui/webui/resources/js/local_strings.js"></script>
|
| +<script src="../../../../ui/webui/resources/js/load_time_data.js"></script>
|
|
|
| <script>
|
| -var localStrings = new LocalStrings();
|
|
|
| function sendCommand(cmd) {
|
| window.domAutomationController.setAutomationId(1);
|
| @@ -47,8 +46,8 @@ function forceLoad() {
|
| }
|
|
|
| document.addEventListener('DOMContentLoaded', function() {
|
| - var showDelayTime = localStrings.getString('show_delay_time');
|
| - var totalWaitTime = localStrings.getString('total_wait_time');
|
| + var showDelayTime = loadTimeData.getString('show_delay_time');
|
| + var totalWaitTime = loadTimeData.getString('total_wait_time');
|
| window.setTimeout(showPage, showDelayTime);
|
| window.setTimeout(forceLoad, totalWaitTime);
|
| });
|
|
|