Vectorize help icon in Ash system menu for MD

ash/common/system/date/date_default_view.cc

 // Copyright 2014 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/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"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #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"
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
@@ skipping 27 matching lines @@
   WmShell* shell = WmShell::Get();
   const bool adding_user =
       shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 
   if (login == LoginStatus::LOCKED || login == LoginStatus::NOT_LOGGED_IN ||
       adding_user)
     return;
 
   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
     // is flipped in RTL locales, however Hebrew uses the LTR '?'. So the
     // flipping must be disabled. (crbug.com/475237)
     help_button_->EnableCanvasFlippingForRTLUI(false);
   }
   help_button_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_HELP));
   view->AddButton(help_button_);
 
@@ skipping 73 matching lines @@
 void DateDefaultView::OnShutdownPolicyChanged(bool reboot_on_shutdown) {
   if (!shutdown_button_)
     return;
 
   shutdown_button_->SetTooltipText(l10n_util::GetStringUTF16(
       reboot_on_shutdown ? IDS_ASH_STATUS_TRAY_REBOOT
                          : IDS_ASH_STATUS_TRAY_SHUTDOWN));
 }
 
 }  // namespace ash