Consolidate search terms extraction and Instant process determination.

chrome/browser/instant/instant_controller.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_INSTANT_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 49 matching lines @@
 //  (3) An InstantTab instance which points to the currently active tab, if it
 //      supports the Embedded Search API.
 //
 // All three are backed by a WebContents. InstantOverlay and InstantNTP own
 // their corresponding WebContents; InstantTab does not. In non-extended mode,
 // only an InstantOverlay instance is kept.
 //
 // InstantController is owned by Browser via BrowserInstantController.
 class InstantController : public InstantPage::Delegate {
  public:
-  // The URL for the local omnibox popup.
-  static const char* kLocalOmniboxPopupURL;
-
   InstantController(chrome::BrowserInstantController* browser,
                     bool extended_enabled);
   virtual ~InstantController();
 
   // Invoked as the user types into the omnibox. |user_text| is what the user
   // has typed. |full_text| is what the omnibox is showing. These may differ if
   // the user typed only some text, and the rest was inline autocompleted. If
   // |verbatim| is true, search results are shown for the exact omnibox text,
   // rather than the best guess as to what the user means. Returns true if the
   // update is accepted (i.e., if |match| is a search rather than a URL).
@@ skipping 305 matching lines @@
   // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
   bool allow_preview_to_show_search_suggestions_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64, std::string> > debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_