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

Side by Side Diff: chrome/browser/resources/options/browser_options.js

Issue 2553673003: [Merge to M55] Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/arc/arc_app_item.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cr.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** 7 /**
8 * @typedef {{actionLinkText: (string|undefined), 8 * @typedef {{actionLinkText: (string|undefined),
9 * childUser: (boolean|undefined), 9 * childUser: (boolean|undefined),
10 * hasError: (boolean|undefined), 10 * hasError: (boolean|undefined),
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 var androidAppSettings = $('android-apps-settings'); 850 var androidAppSettings = $('android-apps-settings');
851 if (androidAppSettings != null) 851 if (androidAppSettings != null)
852 androidAppSettings.hidden = isArcEnabled; 852 androidAppSettings.hidden = isArcEnabled;
853 853
854 var talkbackSettingsButton = $('talkback-settings-button'); 854 var talkbackSettingsButton = $('talkback-settings-button');
855 if (talkbackSettingsButton != null) 855 if (talkbackSettingsButton != null)
856 talkbackSettingsButton.hidden = isArcEnabled; 856 talkbackSettingsButton.hidden = isArcEnabled;
857 }); 857 });
858 858
859 $('android-apps-settings-link').addEventListener('click', function(e) { 859 $('android-apps-settings-link').addEventListener('click', function(e) {
860 chrome.send('showAndroidAppsSettings'); 860 // MouseEvent.detail indicates the current click count (or tap
861 // count, in the case of touch events) in the 'click' event.
862 var activatedFromKeyboard = e.detail == 0;
863 chrome.send('showAndroidAppsSettings', [activatedFromKeyboard]);
861 }); 864 });
862 } 865 }
863 }, 866 },
864 867
865 /** @override */ 868 /** @override */
866 didShowPage: function() { 869 didShowPage: function() {
867 $('search-field').focus(); 870 $('search-field').focus();
868 }, 871 },
869 872
870 /** 873 /**
(...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after
2419 2422
2420 settings.hidden = !isVisible; 2423 settings.hidden = !isVisible;
2421 }; 2424 };
2422 } 2425 }
2423 2426
2424 // Export 2427 // Export
2425 return { 2428 return {
2426 BrowserOptions: BrowserOptions 2429 BrowserOptions: BrowserOptions
2427 }; 2430 };
2428 }); 2431 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/arc/arc_app_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698