Remove non-MD code from overflow button and bubble

ash/common/shelf/overflow_button.h

Index: ash/common/shelf/overflow_button.h
diff --git a/ash/common/shelf/overflow_button.h b/ash/common/shelf/overflow_button.h
index 503811de782446b416be8036a0647755f0b7440c..32bf382225b0f75c8fecdcf7c97b6fc10c16fbf5 100644
--- a/ash/common/shelf/overflow_button.h
+++ b/ash/common/shelf/overflow_button.h
@@ -6,6 +6,7 @@
 #define ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
 
 #include "base/macros.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 
@@ -41,22 +42,11 @@ class OverflowButton : public views::CustomButton {
   void PaintBackground(gfx::Canvas* canvas, const gfx::Rect& bounds);
   void PaintForeground(gfx::Canvas* canvas, const gfx::Rect& bounds);
 
-  // Returns the id of the asset to use for the button backgound based on the
-  // current shelf state.
-  // TODO(tdanderson): Remove this once the material design shelf is enabled
-  // by default. See crbug.com/614453.
-  int NonMaterialBackgroundImageId() const;
-
   // Calculates the bounds of the overflow button based on the shelf alignment.
   gfx::Rect CalculateButtonBounds() const;
 
-  // Used for bottom shelf alignment. |bottom_image_| points to
-  // |bottom_image_md_| for material design, otherwise it is points to a
-  // resource owned by the ResourceBundle.
-  // TODO(tdanderson): Remove the non-md code once the material design shelf is
-  // enabled by default. See crbug.com/614453.
-  const gfx::ImageSkia* bottom_image_;
-  gfx::ImageSkia bottom_image_md_;
+  // Used for bottom shelf alignment.
+  gfx::ImageSkia bottom_image_;
 
   // Cached rotations of |bottom_image_| used for left and right shelf
   // alignments.