Instant cleanup: remove MODE_SEARCH_RESULTS and ORIGIN_SEARCH

chrome/browser/ui/search/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_UI_SEARCH_INSTANT_CONTROLLER_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/common/search/search_types.h"
 
 class BrowserInstantController;
 class GURL;
 class InstantService;
 class Profile;
 struct EmbeddedSearchRequestParams;

[Peter Kasting, 2016/09/02 20:40:59]

Nit: This forward-decl is no longer necessary

[Marc Treib, 2016/09/05 12:11:16]

Done.

 
 namespace content {
 class WebContents;
 }
 
 // InstantController drives Chrome Instant, i.e., the browser implementation of
 // the Embedded Search API (see http://dev.chromium.org/embeddedsearch).
 //
 // In extended mode, InstantController maintains and coordinates an InstantTab.
 // An InstantTab instance points to the currently active tab, if it supports the
 // Embedded Search API. InstantTab is backed by a WebContents and it does not
 // own that WebContents.
 //
 // InstantController is owned by Browser via BrowserInstantController.
 class InstantController : public InstantTab::Delegate {
  public:
   explicit InstantController(BrowserInstantController* browser);
   ~InstantController() override;
 
-  // Called if the browser is navigating to a search URL for |search_terms| with
-  // search-term-replacement enabled. If |instant_tab_| can be used to process
-  // the search, this does so and returns true. Else, returns false.
-  bool SubmitQuery(const base::string16& search_terms,
-                   const EmbeddedSearchRequestParams& params);
-
   // The search mode in the active tab has changed. Bind |instant_tab_| if the
   // |new_mode| reflects an Instant search results page.
   void SearchModeChanged(const SearchMode& old_mode,
                          const SearchMode& new_mode);
 
   // The user switched tabs. Bind |instant_tab_| if the newly active tab is an
   // Instant search results page.
   void ActiveTabChanged();
 
   // Used by BrowserInstantController to notify InstantController about the
@@ skipping 62 matching lines @@
   // The search model mode for the active tab.
   SearchMode search_mode_;
 
   // List of events and their timestamps, useful in debugging Instant behaviour.
   mutable std::list<std::pair<int64_t, std::string>> debug_events_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_