Merge 208596 "Pipe a bit down to the InstantExtended new tab pag..."

chrome/renderer/resources/extensions/searchbox_api.js

 // Copyright 2012 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.
 
 var chrome;
 if (!chrome)
   chrome = {};
 
 if (!chrome.embeddedSearch) {
   chrome.embeddedSearch = new function() {
@@ skipping 240 matching lines @@
       // =======================================================================
       //                            Private functions
       // =======================================================================
       native function GetMostVisitedItems();
       native function GetThemeBackgroundInfo();
       native function DeleteMostVisitedItem();
       native function UndoAllMostVisitedDeletions();
       native function UndoMostVisitedDeletion();
       native function NavigateNewTabPage();
       native function IsInputInProgress();
+      native function GetAppLauncherEnabled();
 
       function GetMostVisitedItemsWrapper() {
         var mostVisitedItems = GetMostVisitedItems();
         for (var i = 0, item; item = mostVisitedItems[i]; ++i) {
           // These properties are private data and should not be returned to
           // the page. They are only accessible via getMostVisitedItemData().
           item.url = null;
           item.title = null;
           item.domain = null;
           item.direction = null;
         }
         return mostVisitedItems;
       }
 
       // =======================================================================
       //                           Exported functions
       // =======================================================================
       this.__defineGetter__('mostVisited', GetMostVisitedItemsWrapper);
       this.__defineGetter__('themeBackgroundInfo', GetThemeBackgroundInfo);
       this.__defineGetter__('isInputInProgress', IsInputInProgress);
+      this.__defineGetter__('appLauncherEnabled', GetAppLauncherEnabled);
 
       this.deleteMostVisitedItem = function(restrictedId) {
         DeleteMostVisitedItem(restrictedId);
       };
       this.undoAllMostVisitedDeletions = function() {
         UndoAllMostVisitedDeletions();
       };
       this.undoMostVisitedDeletion = function(restrictedId) {
         UndoMostVisitedDeletion(restrictedId);
       };
       this.navigateContentWindow = function(destination, disposition) {
         NavigateNewTabPage(destination, disposition);
       }
 
       this.onmostvisitedchange = null;
       this.onthemechange = null;
       this.oninputstart = null;
       this.oninputcancel = null;
     };
 
     // Export legacy searchbox API.
     // TODO: Remove this when Instant Extended is fully launched.
     chrome.searchBox = this.searchBox;
   };
 }