Update ash shelf/tray focus rects.

ash/common/system/tray/tray_popup_header_button.cc

Index: ash/common/system/tray/tray_popup_header_button.cc
diff --git a/ash/common/system/tray/tray_popup_header_button.cc b/ash/common/system/tray/tray_popup_header_button.cc
index 804fcb8720722bc91e5df90b3b9e7588aacd2e8b..ed2bf5c4c1b2bd55189a2f7e072071e9fb150a50 100644
--- a/ash/common/system/tray/tray_popup_header_button.cc
+++ b/ash/common/system/tray/tray_popup_header_button.cc
@@ -5,6 +5,7 @@
 #include "ash/common/system/tray/tray_popup_header_button.h"
 
 #include "ash/common/ash_constants.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/background.h"
@@ -26,19 +27,13 @@ const char TrayPopupHeaderButton::kViewClassName[] =
     "tray/TrayPopupHeaderButton";
 
 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
-                                             const gfx::ImageSkia& icon,
-                                             int accessible_name_id)
-    : views::ToggleImageButton(listener) {
-  Initialize(icon, accessible_name_id);
-}
-
-TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int enabled_resource_id,
                                              int disabled_resource_id,
                                              int enabled_resource_id_hover,
                                              int disabled_resource_id_hover,
                                              int accessible_name_id)
     : views::ToggleImageButton(listener) {
+  DCHECK(!MaterialDesignController::IsSystemTrayMenuMaterial());
   Initialize(*GetImageForResourceId(enabled_resource_id), accessible_name_id);
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   SetToggledImage(views::Button::STATE_NORMAL,