Upstream rewrite of Instant.

chrome/common/instant_types.h

 // Copyright (c) 2011 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_COMMON_INSTANT_TYPES_H_
 #define CHROME_COMMON_INSTANT_TYPES_H_
 
-// Enum describing the ways instant suggest text can be completed.
+#include <string>
+
+// Ways that the Instant suggested text is autocompleted into the omnibox.
 enum InstantCompleteBehavior {
-  // Complete the suggestion now.
+  // Autocomplete the suggestion immediately.
   INSTANT_COMPLETE_NOW,
 
-  // Complete the suggestion after a delay.
+  // Autocomplete the suggestion after a delay.

[sky, 2012/07/19 17:55:19]

Its my understanding we're not using this, can it be removed now?

[Jered, 2012/07/19 22:01:33]

It's still referenced several places in the code, so naively, I don't think so.

[sky, 2012/07/19 23:44:40]

I think it can be removed from all of them. But, that can be done later.

[Jered, 2012/07/20 16:10:18]

I will wait, then.

   INSTANT_COMPLETE_DELAYED,
 
-  // Never complete the suggestion.
+  // Do not autocomplete the suggestion. The suggestion may still be displayed
+  // in the omnibox, but not made a part of the omnibox text by default (e.g.,
+  // by displaying the suggestion as non-highlighted, non-selected gray text).
   INSTANT_COMPLETE_NEVER
 };
 
 #endif  // CHROME_COMMON_INSTANT_TYPES_H_