Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Unified Diff: chrome/browser/ui/app_list/search/omnibox_result.cc

Issue 2365263006: Delete pre-MD code from OmniboxResultView (Closed)
Patch Set: update references to constant (merge resolution) Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 eb052293346c693fb5c66f0420330488579a7bde..6d8812af0739605ea62261bb41987247af800d9c 100644
--- a/chrome/browser/ui/app_list/search/omnibox_result.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_result.cc
@@ -12,13 +12,10 @@
#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"
@@ -171,18 +168,10 @@ void OmniboxResult::UpdateIcon() {
bool is_bookmarked =
bookmark_model && bookmark_model->IsBookmarked(match_.destination_url);
- 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));
+ gfx::VectorIconId icon_id = is_bookmarked ?
+ gfx::VectorIconId::OMNIBOX_STAR :
+ AutocompleteMatch::TypeToVectorIcon(match_.type);
+ SetIcon(gfx::CreateVectorIcon(icon_id, 16, app_list::kIconColor));
}
void OmniboxResult::UpdateTitleAndDetails() {

Powered by Google App Engine
This is Rietveld 408576698