Merge local_omnibox_popup into local_ntp. Render the Google logo and fakebox if Google is the sear…

chrome/browser/search/search.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_SEARCH_H_
 #define CHROME_BROWSER_SEARCH_SEARCH_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 83 matching lines @@
 // if the engine doesn't have an Instant URL, or if it shouldn't be used (say
 // because it doesn't satisfy the requirements for extended mode or if Instant
 // is disabled through preferences). Callers must check that the returned URL is
 // valid before using it. The value of |start_margin| is used for the "es_sm"
 // parameter in the URL.
 // NOTE: This method expands the default search engine's instant_url template,
 // so it shouldn't be called from SearchTermsData or other such code that would
 // lead to an infinite recursion.
 GURL GetInstantURL(Profile* profile, int start_margin);
 
+// Returns the Local Instant URL of the default search engine.  In particular,
+// a Google search provider will include a special query parameter, indicating
+// to the JS that Google-specific New Tab Page elements should be rendered.
+GURL GetLocalInstantURL(Profile* profile);
+
 // Instant (loading a remote server page and talking to it using the searchbox
 // API) is considered enabled if there's a valid Instant URL that can be used,
 // so this simply returns whether GetInstantURL() is a valid URL.
 // NOTE: This method expands the default search engine's instant_ur templatel,
 // so it shouldn't be called from SearchTermsData or other such code that would
 // lead to an infinite recursion.
 bool IsInstantEnabled(Profile* profile);
 
 // Returns true if the aggressive local NTP fallback is enabled in field
 // trials.
@@ skipping 48 matching lines @@
 GURL CoerceCommandLineURLToTemplateURL(const GURL& instant_url,
                                        const TemplateURLRef& ref,
                                        int start_margin);
 
 // Returns true if |my_url| matches |other_url|.
 bool MatchesOriginAndPath(const GURL& my_url, const GURL& other_url);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SEARCH_SEARCH_H_