AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext.

chrome/browser/autocomplete/autocomplete_input.h

Index: chrome/browser/autocomplete/autocomplete_input.h
diff --git a/chrome/browser/autocomplete/autocomplete_input.h b/chrome/browser/autocomplete/autocomplete_input.h
index 8b95d89151a75ab19ad2b2312cff63bad695247b..dc69a9ef3ecc68d3e2759d604e976055f417881f 100644
--- a/chrome/browser/autocomplete/autocomplete_input.h
+++ b/chrome/browser/autocomplete/autocomplete_input.h
@@ -44,11 +44,11 @@ class AutocompleteInput {
     ALL_MATCHES,
   };
 
-  // The type of page currently displayed.
+  // The user's context when initiating this input.
   // Note: when adding an element to this enum, please add it at the end
   // and update omnibox_event.proto::PageClassification and
   // omnibox_edit_model.cc::ClassifyPage() too.
-  enum PageClassification {
+  enum OmniboxContext {

[Peter Kasting, 2013/08/06 19:09:34]

"Omnibox" in this name seems unnecessary if we're already inside
AutocompleteInput.  Should this just be "Context"?  Or "ExternalContext" meaning
the context outside the omnibox itself?

     INVALID_SPEC = 0,   // invalid URI; shouldn't happen
     NEW_TAB_PAGE = 1,   // chrome://newtab/
     // Note that chrome://newtab/ doesn't have to be the built-in
@@ -116,7 +116,7 @@ class AutocompleteInput {
                     size_t cursor_position,
                     const string16& desired_tld,
                     const GURL& current_url,
-                    PageClassification current_page_classification,
+                    OmniboxContext omnibox_context,
                     bool prevent_inline_autocomplete,
                     bool prefer_keyword,
                     bool allow_exact_keyword_match,
@@ -179,10 +179,9 @@ class AutocompleteInput {
   // The current URL, or an invalid GURL if query refinement is not desired.
   const GURL& current_url() const { return current_url_; }
 
-  // The type of page that is currently behind displayed and how it is
-  // displayed (e.g., with search term replacement or without).
-  AutocompleteInput::PageClassification current_page_classification() const {
-    return current_page_classification_;
+  // The user's context when initiating this input.
+  AutocompleteInput::OmniboxContext omnibox_context() const {
+    return omnibox_context_;
   }
 
   // The type of input supplied.
@@ -224,7 +223,7 @@ class AutocompleteInput {
   string16 text_;
   size_t cursor_position_;
   GURL current_url_;
-  AutocompleteInput::PageClassification current_page_classification_;
+  AutocompleteInput::OmniboxContext omnibox_context_;
   Type type_;
   url_parse::Parsed parts_;
   string16 scheme_;