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

Unified Diff: ash/common/system/tray/label_tray_view.cc

Issue 2576133002: chromeos: Remove OS ifdefs from ash/common/system/tray (Closed)
Patch Set: review comments Created 4 years 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 | « no previous file | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/label_tray_view.cc
diff --git a/ash/common/system/tray/label_tray_view.cc b/ash/common/system/tray/label_tray_view.cc
index d6aa7c116979feed995606b89b927ad08c4eff3d..c1099bef13ebb29dbc1ae86390304f1acf4167e5 100644
--- a/ash/common/system/tray/label_tray_view.cc
+++ b/ash/common/system/tray/label_tray_view.cc
@@ -25,7 +25,6 @@ namespace {
// TODO(tdanderson): Remove this once material design is enabled by
// default. See crbug.com/614453.
const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
-#if defined(OS_CHROMEOS)
switch (resource_id) {
case IDR_AURA_UBER_TRAY_ENTERPRISE:
return kSystemMenuBusinessIcon;
@@ -39,8 +38,6 @@ const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
NOTREACHED();
break;
}
-#endif // defined(OS_CHROMEOS)
-
return gfx::kNoneIcon;
}
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698