Revert of Delete pre-MD code from OmniboxResultView

components/toolbar/toolbar_model.h

 // Copyright 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 COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_
 #define COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 25 matching lines @@
   // Returns the URL of the current navigation entry.
   virtual GURL GetURL() const = 0;
 
   // Returns the security level that the toolbar should display.  If
   // |ignore_editing| is true, the result reflects the underlying state of the
   // page without regard to any user edits that may be in progress in the
   // omnibox.
   virtual security_state::SecurityStateModel::SecurityLevel GetSecurityLevel(
       bool ignore_editing) const = 0;
 
-  // Returns the id of the icon to show to the left of the address, based on the
-  // current URL.  When search term replacement is active, this returns a search
-  // icon.  This doesn't cover specialized icons while the user is editing; see
-  // OmniboxView::GetVectorIcon().
+  // Returns the resource_id of the icon to show to the left of the address,
+  // based on the current URL.  When search term replacement is active, this
+  // returns a search icon.  This doesn't cover specialized icons while the
+  // user is editing; see OmniboxView::GetIcon().
+  virtual int GetIcon() const = 0;
+
+  // Like GetIcon(), but gets the vector asset ID.
   virtual gfx::VectorIconId GetVectorIcon() const = 0;
 
   // Returns text for the omnibox secure verbose chip.
   virtual base::string16 GetSecureVerboseText() const = 0;
 
   // Returns the name of the EV cert holder.  This returns an empty string if
   // the security level is not EV_SECURE.
   virtual base::string16 GetEVCertName() const = 0;
 
   // Returns whether the URL for the current navigation entry should be
   // in the location bar.
   virtual bool ShouldDisplayURL() const = 0;
 
   // Whether the text in the omnibox is currently being edited.
   void set_input_in_progress(bool input_in_progress) {
     input_in_progress_ = input_in_progress;
   }
   bool input_in_progress() const { return input_in_progress_; }
 
  protected:
   ToolbarModel() : input_in_progress_(false) {}
 
  private:
   bool input_in_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarModel);
 };
 
 #endif  // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_