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

Unified Diff: ash/common/system/chromeos/brightness/tray_brightness.cc

Issue 2770953003: Remove some pre-md code and assets. (Closed)
Patch Set: Created 3 years, 9 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: ash/common/system/chromeos/brightness/tray_brightness.cc
diff --git a/ash/common/system/chromeos/brightness/tray_brightness.cc b/ash/common/system/chromeos/brightness/tray_brightness.cc
index 4a6cbdbc82f0cb2ee0800b4fb8a1c369441e3d80..0633d5bcf85513490633f4de495c45d95b0a1cd3 100644
--- a/ash/common/system/chromeos/brightness/tray_brightness.cc
+++ b/ash/common/system/chromeos/brightness/tray_brightness.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shell_observer.h"
#include "ash/common/system/brightness_control_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
@@ -103,13 +102,8 @@ BrightnessView::BrightnessView(bool default_view, double initial_percent)
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::ImageView* icon = TrayPopupUtils::CreateMainImageView();
- if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
- icon->SetImage(
- gfx::CreateVectorIcon(kSystemMenuBrightnessIcon, kMenuIconColor));
- } else {
- icon->SetImage(
- rb.GetImageNamed(IDR_AURA_UBER_TRAY_BRIGHTNESS).ToImageSkia());
- }
+ icon->SetImage(
+ gfx::CreateVectorIcon(kSystemMenuBrightnessIcon, kMenuIconColor));
tri_view->AddView(TriView::Container::START, icon);
slider_ = TrayPopupUtils::CreateSlider(this);

Powered by Google App Engine
This is Rietveld 408576698