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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm

Issue 2403853002: cocoa browser: remove remaining non-MD code (Closed)
Patch Set: git cl format 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
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
index 717398d72189ff79fbc77625c9f53e612da0b7ab..b93b01de3dedfbea84c0113be719a33f1f3614df 100644
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
@@ -10,7 +10,7 @@
#include "chrome/browser/favicon/favicon_utils.h"
#include "skia/ext/skia_utils_mac.h"
#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
@@ -34,13 +34,8 @@
return image;
}
- if (ui::MaterialDesignController::IsModeMaterial()) {
- return NSImageFromImageSkia(gfx::CreateVectorIcon(
- gfx::VectorIconId::DEFAULT_FAVICON, kVectorIconSize, color));
- }
-
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
+ return NSImageFromImageSkia(gfx::CreateVectorIcon(
+ gfx::VectorIconId::DEFAULT_FAVICON, kVectorIconSize, color));
}
} // namespace mac
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698