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

Unified Diff: ash/common/material_design/material_design_controller.cc

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase 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 | « ash/ash_chromeos_strings.grdp ('k') | ash/common/system/chromeos/network/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/material_design/material_design_controller.cc
diff --git a/ash/common/material_design/material_design_controller.cc b/ash/common/material_design/material_design_controller.cc
index a2c8607d599910686f91c1a9c7f621141ceed04c..918e3f82fe147bc00284ba1a40aab4a1ec5c54bc 100644
--- a/ash/common/material_design/material_design_controller.cc
+++ b/ash/common/material_design/material_design_controller.cc
@@ -10,10 +10,6 @@
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
-#if defined(OS_CHROMEOS)
-#include "ui/chromeos/material_design_icon_controller.h"
-#endif // OS_CHROMEOS
-
namespace ash {
namespace {
@@ -44,11 +40,6 @@ void MaterialDesignController::Initialize() {
}
SetMode(DefaultMode());
}
-
-#if defined(OS_CHROMEOS)
- ui::md_icon_controller::SetUseMaterialDesignNetworkIcons(
- UseMaterialDesignSystemIcons());
-#endif // OS_CHROMEOS
}
// static
« no previous file with comments | « ash/ash_chromeos_strings.grdp ('k') | ash/common/system/chromeos/network/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698