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

Side by Side Diff: chrome/browser/resources/settings/settings_page/settings_subpage.js

Issue 2248083004: Settings: Fix Clear Browsing Data dialog scrolling to Privacy page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * 'settings-subpage' shows a subpage beneath a subheader. The header contains 7 * 'settings-subpage' shows a subpage beneath a subheader. The header contains
8 * the subpage title and a back icon. 8 * the subpage title and a back icon.
9 */ 9 */
10 10
(...skipping 25 matching lines...) Expand all
36 * @type {?HTMLElement} 36 * @type {?HTMLElement}
37 */ 37 */
38 associatedControl: { 38 associatedControl: {
39 type: Object, 39 type: Object,
40 value: null, 40 value: null,
41 }, 41 },
42 }, 42 },
43 43
44 /** @private */ 44 /** @private */
45 onTapBack_: function() { 45 onTapBack_: function() {
46 var previousRoute = 46 settings.navigateToPreviousRoute();
47 window.history.state &&
48 assert(settings.getRouteForPath(
49 /** @type {string} */ (window.history.state)));
50
51 if (previousRoute)
52 window.history.back();
53 else
54 settings.navigateTo(assert(settings.getCurrentRoute().parent));
55 }, 47 },
56 48
57 /** @private */ 49 /** @private */
58 onSearchChanged_: function(e) { 50 onSearchChanged_: function(e) {
59 this.searchTerm = e.detail; 51 this.searchTerm = e.detail;
60 }, 52 },
61 }); 53 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/route.js ('k') | chrome/test/data/webui/settings/route_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698