Remove ash's MaterialDesignController.

ash/system/palette/palette_tray.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/palette/palette_tray.h"
 
-#include "ash/material_design/material_design_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shelf/wm_shelf_util.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
@@ skipping 61 matching lines @@
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     SetLayoutManager(box_layout);
 
     auto* title_label =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_TITLE));
     title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(title_label);
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE);
     style.SetupLabel(title_label);
     box_layout->SetFlexForView(title_label, 1);
-    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      help_button_ =
-          new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
-                               kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
-      settings_button_ = new SystemMenuButton(
-          this, TrayPopupInkDropStyle::HOST_CENTERED, kSystemMenuSettingsIcon,
-          IDS_ASH_PALETTE_SETTINGS);
-    } else {
-      gfx::ImageSkia help_icon =
-          gfx::CreateVectorIcon(kSystemMenuHelpIcon, kMenuIconColor);
-      gfx::ImageSkia settings_icon =
-          gfx::CreateVectorIcon(kSystemMenuSettingsIcon, kMenuIconColor);
-
-      auto* help_button = new ash::TrayPopupHeaderButton(
-          this, help_icon, IDS_ASH_STATUS_TRAY_HELP);
-      help_button->SetTooltipText(
-          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
-      help_button_ = help_button;
-
-      auto* settings_button = new ash::TrayPopupHeaderButton(
-          this, settings_icon, IDS_ASH_STATUS_TRAY_SETTINGS);
-      settings_button->SetTooltipText(
-          l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SETTINGS));
-      settings_button_ = settings_button;
-    }
+    help_button_ =
+        new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
+                             kSystemMenuHelpIcon, IDS_ASH_STATUS_TRAY_HELP);
+    settings_button_ =
+        new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
+                             kSystemMenuSettingsIcon, IDS_ASH_PALETTE_SETTINGS);
 
     AddChildView(help_button_);
     AddChildView(settings_button_);
   }
 
   ~TitleView() override {}
 
  private:
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
@@ skipping 22 matching lines @@
 };
 
 }  // namespace
 
 PaletteTray::PaletteTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf, true),
       palette_tool_manager_(new PaletteToolManager(this)),
       weak_factory_(this) {
   PaletteTool::RegisterToolInstances(palette_tool_manager_.get());
 
-  if (MaterialDesignController::IsShelfMaterial())
-    SetInkDropMode(InkDropMode::ON);
-
+  SetInkDropMode(InkDropMode::ON);
   SetLayoutManager(new views::FillLayout());
   icon_ = new views::ImageView();
   UpdateTrayIcon();
 
   tray_container()->SetMargin(kTrayIconMainAxisInset, kTrayIconCrossAxisInset);
   tray_container()->AddChildView(icon_);
 
   Shell::Get()->AddShellObserver(this);
   Shell::Get()->session_controller()->AddSessionStateObserver(this);
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
@@ skipping 257 matching lines @@
     UpdateIconVisibility();
   }
 }
 
 void PaletteTray::UpdateIconVisibility() {
   SetVisible(is_palette_enabled_ && palette_utils::HasStylusInput() &&
              IsInUserSession());
 }
 
 }  // namespace ash