Merge 74015 - NTP: Fix restore all...

chrome/browser/resources/new_new_tab.js

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // To avoid creating tons of unnecessary nodes. We assume we cannot fit more
 // than this many items in the miniview.
 var MAX_MINIVIEW_ITEMS = 15;
 
 // Extra spacing at the top of the layout.
 var LAYOUT_SPACING_TOP = 25;
@@ skipping 1009 matching lines @@
 /**
  * Hides the notifier.
  */
 function hideNotification() {
   var notificationElement = $('notification');
   notificationElement.classList.remove('show');
   document.body.classList.remove('notification-shown');
   var actionLink = notificationElement.querySelector('#actionlink');
   var closeButton = notificationElement.querySelector('#notification-close');
   // Prevent tabbing to the hidden link.
-  actionLink.tabIndex = -1;
-  closeButton.tabIndex = -1;
   // Setting tabIndex to -1 only prevents future tabbing to it. If, however, the
   // user switches window or a tab and then moves back to this tab the element
   // may gain focus. We therefore make sure that we blur the element so that the
   // element focus is not restored when coming back to this window.
-  actionLink.blur();
-  closeButton.blur();
+  if (actionLink) {
+    actionLink.tabIndex = -1;
+    actionLink.blur();
+  }
+  if (closeButton) {
+    closeButton.tabIndex = -1;
+    closeButton.blur();
+  }
 }
 
 function showFirstRunNotification() {
   showNotification(localStrings.getString('firstrunnotification'),
                    null, null, 30000);
   var notificationElement = $('notification');
   notification.classList.add('first-run');
 }
 
 function showPromoNotification() {
@@ skipping 385 matching lines @@
   var promoLink = document.querySelector('#apps-promo-text1 a');
   promoLink.id = 'apps-promo-link';
   promoLink.href = localStrings.getString('web_store_url');
 
   $('apps-promo-hide').addEventListener('click', function() {
     chrome.send('hideAppsPromo', []);
     document.documentElement.classList.remove('apps-promo-visible');
     layoutSections();
   });
 });