Vectorize help icon in Ash system menu for MD

ash/common/system/date/date_default_view.cc

Index: ash/common/system/date/date_default_view.cc
diff --git a/ash/common/system/date/date_default_view.cc b/ash/common/system/date/date_default_view.cc
index 35eddfb5a4b05410e64cb15f54942899e8e97a03..f49646e3c4c035fcb672d10782f0f6294a764709 100644
--- a/ash/common/system/date/date_default_view.cc
+++ b/ash/common/system/date/date_default_view.cc
@@ -4,6 +4,7 @@
 
 #include "ash/common/system/date/date_default_view.h"
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/date/date_view.h"
@@ -12,10 +13,13 @@
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/i18n/rtl.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/color_utils.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/layout/fill_layout.h"
@@ -63,10 +67,18 @@ DateDefaultView::DateDefaultView(LoginStatus login)
 
   date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);
 
-  help_button_ = new TrayPopupHeaderButton(
-      this, IDR_AURA_UBER_TRAY_HELP, IDR_AURA_UBER_TRAY_HELP,
-      IDR_AURA_UBER_TRAY_HELP_HOVER, IDR_AURA_UBER_TRAY_HELP_HOVER,
-      IDS_ASH_STATUS_TRAY_HELP);
+  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+    gfx::ImageSkia help_icon = gfx::CreateVectorIcon(
+        kSystemMenuHelpIcon,
+        color_utils::DeriveDefaultIconColor(kMenuIconColor));

[tdanderson, 2016/09/14 14:56:12]

No need for DeriveDefaultIconColor, you can just pass in kMenuIconColor directly
here.

[mohsen, 2016/09/14 22:10:50]

Done.

+    help_button_ =
+        new TrayPopupHeaderButton(this, help_icon, IDS_ASH_STATUS_TRAY_HELP);
+  } else {
+    help_button_ = new TrayPopupHeaderButton(
+        this, IDR_AURA_UBER_TRAY_HELP, IDR_AURA_UBER_TRAY_HELP,
+        IDR_AURA_UBER_TRAY_HELP_HOVER, IDR_AURA_UBER_TRAY_HELP_HOVER,
+        IDS_ASH_STATUS_TRAY_HELP);
+  }
   if (base::i18n::IsRTL() &&

[mohsen, 2016/09/13 15:39:41]

still relevant?

[tdanderson, 2016/09/14 14:56:12]

Not sure, but let's assume so.

[mohsen, 2016/09/14 22:10:50]

Oops. That was meant to be a note to myself ;) Sorry, for publishing!

       base::i18n::GetConfiguredLocale() == kHebrewLocale) {
     // The asset for the help button is a question mark '?'. Normally this asset