Revert of Delete pre-MD code from OmniboxResultView

chrome/browser/ui/app_list/search/omnibox_result.cc

Index: chrome/browser/ui/app_list/search/omnibox_result.cc
diff --git a/chrome/browser/ui/app_list/search/omnibox_result.cc b/chrome/browser/ui/app_list/search/omnibox_result.cc
index 6d8812af0739605ea62261bb41987247af800d9c..eb052293346c693fb5c66f0420330488579a7bde 100644
--- a/chrome/browser/ui/app_list/search/omnibox_result.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_result.cc
@@ -12,10 +12,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
+#include "chrome/grit/theme_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "ui/app_list/app_list_constants.h"
+#include "ui/base/material_design/material_design_controller.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "url/gurl.h"
@@ -168,10 +171,18 @@
   bool is_bookmarked =
       bookmark_model && bookmark_model->IsBookmarked(match_.destination_url);
 
-  gfx::VectorIconId icon_id = is_bookmarked ?
-      gfx::VectorIconId::OMNIBOX_STAR :
-      AutocompleteMatch::TypeToVectorIcon(match_.type);
-  SetIcon(gfx::CreateVectorIcon(icon_id, 16, app_list::kIconColor));
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    gfx::VectorIconId icon_id = is_bookmarked ?
+        gfx::VectorIconId::OMNIBOX_STAR :
+        AutocompleteMatch::TypeToVectorIcon(match_.type);
+    SetIcon(gfx::CreateVectorIcon(icon_id, 16, app_list::kIconColor));
+    return;
+  }
+
+  int resource_id = is_bookmarked ? IDR_OMNIBOX_STAR
+                                  : AutocompleteMatch::TypeToIcon(match_.type);
+  SetIcon(
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id));
 }
 
 void OmniboxResult::UpdateTitleAndDetails() {