Revert of Delete pre-MD code from OmniboxResultView (patchset #9 id:160001 of https://codereview.ch…

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

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/app_list/search/omnibox_result.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #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"
 #include "url/url_canon.h"
 
 using bookmarks::BookmarkModel;
 
 namespace app_list {
 
 namespace {
@@ skipping 132 matching lines @@
       new OmniboxResult(profile_, list_controller_, autocomplete_controller_,
                         is_voice_query_, match_));
 }
 
 void OmniboxResult::UpdateIcon() {
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForBrowserContext(profile_);
   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() {
   set_title(match_.contents);
   SearchResult::Tags title_tags;
   ACMatchClassificationsToTags(match_.contents, match_.contents_class,
                                &title_tags);
   set_title_tags(title_tags);
 
   set_details(match_.description);
   SearchResult::Tags details_tags;
   ACMatchClassificationsToTags(match_.description, match_.description_class,
                                &details_tags);
   set_details_tags(details_tags);
 }
 
 }  // namespace app_list