Merge r17891....

chrome/browser/autocomplete/autocomplete.h

 // Copyright (c) 2006-2008 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_AUTOCOMPLETE_AUTOCOMPLETE_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 746 matching lines @@
   // result set that tracks the displayed matches.
   void Stop(bool clear_result);
 
   // Asks the relevant provider to delete |match|, and ensures observers are
   // notified of resulting changes immediately.
   void DeleteMatch(const AutocompleteMatch& match);
 
   // Getters
   const AutocompleteInput& input() const { return input_; }
   const AutocompleteResult& result() const { return result_; }
+  // This next is temporary and should go away when
+  // AutocompletePopup::URLsForCurrentSelection() moves to the controller.
+  const AutocompleteResult& latest_result() const { return latest_result_; }
   const bool done() const { return done_; }
 
   // From AutocompleteProvider::Listener
   virtual void OnProviderUpdate(bool updated_matches);
 
  private:
   // Updates |latest_result_| and |done_| to reflect the current provider state.
   // Resets timers and fires notifications as necessary.  |is_synchronous_pass|
   // is true only when Start() is calling this to get the synchronous results.
   void UpdateLatestResult(bool is_synchronous_pass);
 
   // Copies |latest_result_| to |result_| and notifies observers of updates.
   void CommitResult();
+
   // Returns the matches from |provider| whose destination urls are not in
   // |latest_result_|.
   ACMatches GetMatchesNotInLatestResult(
       const AutocompleteProvider* provider) const;
 
   // If the HistoryContentsAutocomplete provider is done and there are more
   // matches in the database than currently shown, an entry is added to
   // |latest_result_| to show all history matches.
   void AddHistoryContentsShortcut();
 
@@ skipping 57 matching lines @@
   AutocompleteInput::Type input_type;
   // Selected index (if selected) or -1 (AutocompletePopupModel::kNoMatch).
   size_t selected_index;
   // Inline autocompleted length (if displayed).
   size_t inline_autocompleted_length;
   // Result set.
   const AutocompleteResult& result;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_