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

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

Issue 2540433002: Reland "Propagate information about how ARC apps are launched" (Closed)
Patch Set: Fixed use-after-free 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
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 * accountInfo: (string|undefined), 9 * accountInfo: (string|undefined),
10 * childUser: (boolean|undefined), 10 * childUser: (boolean|undefined),
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 var androidAppSettings = $('android-apps-settings'); 863 var androidAppSettings = $('android-apps-settings');
864 if (androidAppSettings != null) 864 if (androidAppSettings != null)
865 androidAppSettings.hidden = isArcEnabled; 865 androidAppSettings.hidden = isArcEnabled;
866 866
867 var talkbackSettingsButton = $('talkback-settings-button'); 867 var talkbackSettingsButton = $('talkback-settings-button');
868 if (talkbackSettingsButton != null) 868 if (talkbackSettingsButton != null)
869 talkbackSettingsButton.hidden = isArcEnabled; 869 talkbackSettingsButton.hidden = isArcEnabled;
870 }); 870 });
871 871
872 $('android-apps-settings-link').addEventListener('click', function(e) { 872 $('android-apps-settings-link').addEventListener('click', function(e) {
873 chrome.send('showAndroidAppsSettings'); 873 // MouseEvent.detail indicates the current click count (or tap
874 // count, in the case of touch events) in the 'click' event.
875 var activatedFromKeyboard = e.detail == 0;
876 chrome.send('showAndroidAppsSettings', [activatedFromKeyboard]);
874 }); 877 });
875 } 878 }
876 }, 879 },
877 880
878 /** @override */ 881 /** @override */
879 didShowPage: function() { 882 didShowPage: function() {
880 $('search-field').focus(); 883 $('search-field').focus();
881 }, 884 },
882 885
883 /** 886 /**
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after
2463 2466
2464 settings.hidden = !isVisible; 2467 settings.hidden = !isVisible;
2465 }; 2468 };
2466 } 2469 }
2467 2470
2468 // Export 2471 // Export
2469 return { 2472 return {
2470 BrowserOptions: BrowserOptions 2473 BrowserOptions: BrowserOptions
2471 }; 2474 };
2472 }); 2475 });
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_launcher.cc ('k') | 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