Revert 33527 - Put "make this my home page" link into the tip section....

chrome/browser/resources/new_new_tab.js

 
 // Helpers
 
 // TODO(arv): Remove these when classList is available in HTML5.
 // https://bugs.webkit.org/show_bug.cgi?id=20709
 function hasClass(el, name) {
   return el.nodeType == 1 && el.className.split(/\s+/).indexOf(name) != -1;
 }
 
 function addClass(el, name) {
@@ skipping 84 matching lines @@
 var tipCache = {};
 
 function tips(data) {
   logEvent('received tips');
   tipCache = data;
   renderTip();
 }
 
 function createTip(data) {
   if (data.length) {
-    if (data[0].set_homepage_tip) {
-      var homepageButton = document.createElement('button');
-      homepageButton.className = 'link';
-      homepageButton.textContent = data[0].set_homepage_tip;
-      homepageButton.addEventListener('click', setAsHomePageLinkClicked);
-      return homepageButton;
-    } else {
-      try {
-        return parseHtmlSubset(data[0].tip_html_text);
-      } catch (parseErr) {
-        console.error('Error parsing tips: ' + parseErr.message);
-      }
+    try {
+      return parseHtmlSubset(data[0].tip_html_text);
+    } catch (parseErr) {
+      console.error('Error parsing tips: ' + parseErr.message);
     }
   }
   // Return an empty DF in case of failure.
   return document.createDocumentFragment();
 }
 
-function clearTipLine() {
+function renderTip() {
   var tipElement = $('tip-line');
   // There should always be only one tip.
   tipElement.textContent = '';
-  tipElement.removeEventListener('click', setAsHomePageLinkClicked);
-}
-
-function renderTip() {
-  clearTipLine();
-  var tipElement = $('tip-line');
   tipElement.appendChild(createTip(tipCache));
   fixLinkUnderlines(tipElement);
 }
 
 function recentlyClosedTabs(data) {
   logEvent('received recently closed tabs');
   // We need to store the recent items so we can update the layout on a resize.
   recentItems = data;
   renderRecentlyClosed();
 }
@@ skipping 1121 matching lines @@
     bind(logEvent, global, 'Tab.NewTabDOMContentLoaded', true));
 
 // Whether or not we should send the initial 'GetSyncMessage' to the backend
 // depends on the value of the attribue 'syncispresent' which the backend sets
 // to indicate if there is code in the backend which is capable of processing
 // this message. This attribute is loaded by the JSTemplate and therefore we
 // must make sure we check the attribute after the DOM is loaded.
 document.addEventListener('DOMContentLoaded',
                           callGetSyncMessageIfSyncIsPresent);
 
+// This link allows user to make new tab page as homepage from the new tab
+// page itself (without going to Options dialog box).
+document.addEventListener('DOMContentLoaded', showSetAsHomePageLink);
+
 // Set up links and text-decoration for promotional message.
 document.addEventListener('DOMContentLoaded', setUpPromoMessage);
 
 /**
  * The sync code is not yet built by default on all platforms so we have to
  * make sure we don't send the initial sync message to the backend unless the
  * backend told us that the sync code is present.
  */
 function callGetSyncMessageIfSyncIsPresent() {
   if (document.documentElement.getAttribute('syncispresent') == 'true') {
     chrome.send('GetSyncMessage');
   }
 }
 
 function setAsHomePageLinkClicked(e) {
   chrome.send('setHomePage');
   e.preventDefault();
 }
 
+function showSetAsHomePageLink() {
+  var setAsHomePageElement = $('set-as-home-page');
+  var style = setAsHomePageElement.style;
+  if (document.documentElement.getAttribute('showsetashomepage') != 'true') {
+    // Hide the section (if new tab page is already homepage).
+    return;
+  }
+
+  style.display = 'block';
+  var buttonElement = setAsHomePageElement.firstElementChild;
+  buttonElement.addEventListener('click', setAsHomePageLinkClicked);
+}
+
 function onHomePageSet(data) {
+  $('set-as-home-page').style.display = 'none';
   showNotification(data[0], data[1]);
-  // Removes the "make this my home page" tip.
-  clearTipLine();
 }
 
 function hideAllMenus() {
   optionMenu.hide();
 }
 
 window.addEventListener('blur', hideAllMenus);
 window.addEventListener('keydown', function(e) {
   if (e.keyIdentifier == 'Alt' || e.keyIdentifier == 'Meta') {
     hideAllMenus();
@@ skipping 327 matching lines @@
   syncButton.onclick = syncSectionLinkClicked;
   fixLinkUnderlines($('promo-message'));
 }
 
 // A Windows-specific Webkit bug adds padding to buttons and will push the
 // bookmark sync button in the promo message too far to the right unless we
 // use this fix.  See https://bugs.webkit.org/show_bug.cgi?id=31703
 if (navigator.platform == 'Win32') {
   addClass(document.body, 'win-button-padding-bug');
 }