AutocompleteInput::PageClassification -> AutocompleteInput::OmniboxContext.

chrome/browser/autocomplete/autocomplete_input.h

 // Copyright (c) 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_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
     // higher-level "synchronous" query.
     BEST_MATCH,
 
     // Only synchronous matches should be returned.
     SYNCHRONOUS_MATCHES,
 
     // All matches should be fetched.
     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
     // version; it could be replaced by an extension.
     BLANK = 2,          // about:blank
     HOMEPAGE = 3,       // user switched settings to "open this page" mode.
     // Note that if the homepage is set to the new tab page or about blank,
     // then we'll classify the web page into those categories, not HOMEPAGE.
     OTHER = 4,          // everything not included somewhere else on this list
     // The instant new tab page enum value was deprecated on August 2, 2013.
@@ skipping 47 matching lines @@
   // in a page and telling the browser to search for it or navigate to it. This
   // parameter only applies to substituting keywords.
   //
   // If |matches_requested| is BEST_MATCH or SYNCHRONOUS_MATCHES the controller
   // asks the providers to only return matches which are synchronously
   // available, which should mean that all providers will be done immediately.
   AutocompleteInput(const string16& text,
                     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,
                     MatchesRequested matches_requested);
   ~AutocompleteInput();
 
   // If type is |FORCED_QUERY| and |text| starts with '?', it is removed.
   // Returns number of leading characters removed.
   static size_t RemoveForcedQueryStringIfNecessary(Type type, string16* text);
 
@@ skipping 42 matching lines @@
   // Use of this setter is risky, since no other internal state is updated
   // besides |text_|, |cursor_position_| and |parts_|.  Only callers who know
   // that they're not changing the type/scheme/etc. should use this.
   void UpdateText(const string16& text,
                   size_t cursor_position,
                   const url_parse::Parsed& parts);
 
   // 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.
   Type type() const { return type_; }
 
   // Returns parsed URL components.
   const url_parse::Parsed& parts() const { return parts_; }
 
   // The scheme parsed from the provided text; only meaningful when type_ is
   // URL.
@@ skipping 21 matching lines @@
 
   // Resets all internal variables to the null-constructed state.
   void Clear();
 
  private:
   // NOTE: Whenever adding a new field here, please make sure to update Clear()
   // method.
   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_;
   GURL canonicalized_url_;
   bool prevent_inline_autocomplete_;
   bool prefer_keyword_;
   bool allow_exact_keyword_match_;
   MatchesRequested matches_requested_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_INPUT_H_