OLD | NEW |
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 cr.define('options', function() { | 5 cr.define('options', function() { |
6 var OptionsPage = options.OptionsPage; | 6 var OptionsPage = options.OptionsPage; |
7 var ArrayDataModel = cr.ui.ArrayDataModel; | 7 var ArrayDataModel = cr.ui.ArrayDataModel; |
8 var RepeatingButton = cr.ui.RepeatingButton; | 8 var RepeatingButton = cr.ui.RepeatingButton; |
9 | 9 |
10 // | 10 // |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 }; | 222 }; |
223 } | 223 } |
224 | 224 |
225 $('manage-accounts-button').onclick = function(event) { | 225 $('manage-accounts-button').onclick = function(event) { |
226 OptionsPage.navigateToPage('accounts'); | 226 OptionsPage.navigateToPage('accounts'); |
227 chrome.send('coreOptionsUserMetricsAction', | 227 chrome.send('coreOptionsUserMetricsAction', |
228 ['Options_ManageAccounts']); | 228 ['Options_ManageAccounts']); |
229 }; | 229 }; |
230 } else { | 230 } else { |
231 $('import-data').onclick = function(event) { | 231 $('import-data').onclick = function(event) { |
232 // Make sure that any previous import success message is hidden, and | 232 ImportDataOverlay.show(); |
233 // we're showing the UI to import further data. | |
234 $('import-data-configure').hidden = false; | |
235 $('import-data-success').hidden = true; | |
236 OptionsPage.navigateToPage('importData'); | |
237 chrome.send('coreOptionsUserMetricsAction', ['Import_ShowDlg']); | 233 chrome.send('coreOptionsUserMetricsAction', ['Import_ShowDlg']); |
238 }; | 234 }; |
239 | 235 |
240 if ($('themes-GTK-button')) { | 236 if ($('themes-GTK-button')) { |
241 $('themes-GTK-button').onclick = function(event) { | 237 $('themes-GTK-button').onclick = function(event) { |
242 chrome.send('themesSetGTK'); | 238 chrome.send('themesSetGTK'); |
243 }; | 239 }; |
244 } | 240 } |
245 } | 241 } |
246 | 242 |
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1281 BrowserOptions.getLoggedInUsername = function() { | 1277 BrowserOptions.getLoggedInUsername = function() { |
1282 return BrowserOptions.getInstance().username_; | 1278 return BrowserOptions.getInstance().username_; |
1283 }; | 1279 }; |
1284 } | 1280 } |
1285 | 1281 |
1286 // Export | 1282 // Export |
1287 return { | 1283 return { |
1288 BrowserOptions: BrowserOptions | 1284 BrowserOptions: BrowserOptions |
1289 }; | 1285 }; |
1290 }); | 1286 }); |
OLD | NEW |