Move Ash-specific vector icons to ash/common/resources

ash/common/system/ime/tray_ime_chromeos.cc

Index: ash/common/system/ime/tray_ime_chromeos.cc
diff --git a/ash/common/system/ime/tray_ime_chromeos.cc b/ash/common/system/ime/tray_ime_chromeos.cc
index 8b69585bbd04986a522a33bc42a0238ac7586e2c..c8df13c3b12c35a077a53237a7d64f78110e1517 100644
--- a/ash/common/system/ime/tray_ime_chromeos.cc
+++ b/ash/common/system/ime/tray_ime_chromeos.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/resources/vector_icons.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
@@ -30,7 +31,6 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -73,8 +73,8 @@ class IMEDefaultView : public TrayItemMore {
   explicit IMEDefaultView(SystemTrayItem* owner, const base::string16& label)
       : TrayItemMore(owner, true) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::SYSTEM_MENU_KEYBOARD,
-                                     kMenuIconColor));
+      SetImage(
+          gfx::CreateVectorIcon(&ash::SYSTEM_MENU_KEYBOARD, kMenuIconColor));

[tdanderson, 2016/08/19 21:23:35]

Sample call site. I'm not a fan of the ALL_CAPS_NAME (and it violates the style
guide) so I'll change aggregate_vector_icons.py to map
"system_menu_keyboard.icon" to the const name "kSystemMenuKeyboard" (although
this could possibly lead to confusion).

[Evan Stade, 2016/08/22 16:46:54]

sg (You can append Icon if you want, it simply wasn't necessary when you had
gfx::VectorIconId:: before the name)

Also, why is this passed by pointer? wouldn't ash::kSystemMenuKeyboard be
sufficient?

[tdanderson, 2016/08/25 21:54:32]

Icon appended.
Changed in next patch set.

     } else {
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       SetImage(*bundle.GetImageNamed(IDR_AURA_UBER_TRAY_IME).ToImageSkia());