Merge r17891....

chrome/browser/autocomplete/autocomplete_popup_model.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_POPUP_MODEL_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/common/notification_registrar.h"
@@ skipping 68 matching lines @@
   //
   // If |transition_type| is non-NULL, it will be set to the appropriate
   // transition type for the selected entry (TYPED or GENERATED).
   //
   // If |is_history_what_you_typed_match| is non-NULL, it will be set based on
   // the selected entry's is_history_what_you_typed value.
   //
   // If |alternate_nav_url| is non-NULL, it will be set to the alternate
   // navigation URL for |url| if one exists, or left unchanged otherwise.  See
   // comments on AutocompleteResult::GetAlternateNavURL().
+  //
+  // TODO(pkasting): When manually_selected_match_ moves to the controller, this
+  // can move too.
   GURL URLsForCurrentSelection(
       PageTransition::Type* transition,
       bool* is_history_what_you_typed_match,
       GURL* alternate_nav_url) const;
 
   // This is sort of a hybrid between StartAutocomplete() and
   // URLForCurrentSelection().  When the popup isn't open and the user hits
   // enter, we want to get the default match for the user's input immediately,
   // and not open the popup, continue running autocomplete, etc.  Therefore,
   // this does a query for only the synchronously available matches for the
@@ skipping 67 matching lines @@
   AutocompleteResult::Selection manually_selected_match_;
 
   // A hack for URLsForDefaultMatch() that makes the code in Observe() do
   // nothing.
   bool inside_synchronous_query_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_