Move more vector icons into respective directories.

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

 // Copyright 2012 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 "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 22 matching lines @@
 #include "components/strings/grit/components_strings.h"
 #include "components/sync_sessions/open_tabs_ui_delegate.h"
 #include "components/sync_sessions/synced_session.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 
 #if !defined(OS_MACOSX)
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/common/accelerators/accelerator_table.h"  // nogncheck
 #endif  // defined(USE_ASH)
 
 namespace {
 
 // Initial comamnd ID's for navigatable (and hence executable) tab/window menu
 // items.  The menumodel and storage structures are not 1-1:
@@ skipping 68 matching lines @@
   return command_id;
 }
 
 // Convert |command_id| of menu item to index in |local_window_items_|.
 int CommandIdToWindowVectorIndex(int command_id) {
   DCHECK(IsWindowModelCommandId(command_id));
   return command_id - kFirstLocalWindowCommandId;
 }
 
 #if !defined(OS_MACOSX)
-gfx::Image CreateFavicon(gfx::VectorIconId id) {
-  return gfx::Image(gfx::CreateVectorIcon(id, 16, gfx::kChromeIconGrey));
+gfx::Image CreateFavicon(const gfx::VectorIcon& icon) {
+  return gfx::Image(gfx::CreateVectorIcon(icon, 16, gfx::kChromeIconGrey));
 }
 #endif
 
 }  // namespace
 
 enum RecentTabAction {
   LOCAL_SESSION_TAB = 0,
   OTHER_DEVICE_TAB,
   RESTORE_WINDOW,
   SHOW_MORE,
@@ skipping 286 matching lines @@
                              IDS_RECENTLY_CLOSED);
   } else {
     InsertItemWithStringIdAt(++last_local_model_index_,
                              kRecentlyClosedHeaderCommandId,
                              IDS_RECENTLY_CLOSED);
 #if defined(OS_MACOSX)
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     SetIcon(last_local_model_index_,
             rb.GetNativeImageNamed(IDR_RECENTLY_CLOSED_WINDOW));
 #else
-    SetIcon(last_local_model_index_, CreateFavicon(gfx::VectorIconId::TAB));
+    SetIcon(last_local_model_index_, CreateFavicon(kTabIcon));
 #endif
 
     int added_count = 0;
     for (const auto& entry : service->entries()) {
       if (added_count == kMaxLocalEntries)
         break;
       switch (entry->type) {
         case sessions::TabRestoreService::TAB: {
           auto& tab =
               static_cast<const sessions::TabRestoreService::Tab&>(*entry);
@@ skipping 92 matching lines @@
     int num_tabs,
     int curr_model_index) {
   int command_id = WindowVectorIndexToCommandId(local_window_items_.size());
   // See comments in BuildLocalEntries() about usage of InsertItem*At().
   InsertItemAt(curr_model_index, command_id, l10n_util::GetPluralStringFUTF16(
       IDS_RECENTLY_CLOSED_WINDOW, num_tabs));
 #if defined(OS_MACOSX)
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetIcon(curr_model_index, rb.GetNativeImageNamed(IDR_RECENTLY_CLOSED_WINDOW));
 #else
-  SetIcon(curr_model_index, CreateFavicon(gfx::VectorIconId::TAB));
+  SetIcon(curr_model_index, CreateFavicon(kTabIcon));
 #endif
   local_window_items_.push_back(window_id);
 }
 
 void RecentTabsSubMenuModel::BuildOtherDevicesTabItem(
     const std::string& session_tag,
     const sessions::SessionTab& tab) {
   const sessions::SerializedNavigationEntry& current_navigation =
       tab.navigations.at(tab.normalized_navigation_index());
   TabNavigationItem item(session_tag, tab.tab_id.id(),
@@ skipping 31 matching lines @@
     case sync_sessions::SyncedSession::TYPE_LINUX:
     case sync_sessions::SyncedSession::TYPE_OTHER:
     case sync_sessions::SyncedSession::TYPE_UNSET:
       favicon_id = IDR_LAPTOP_FAVICON;
       break;
   }
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetIcon(index_in_menu, rb.GetNativeImageNamed(favicon_id));
 #else
-  gfx::VectorIconId favicon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
+  const gfx::VectorIcon* favicon = nullptr;
   switch (device_type) {
     case sync_sessions::SyncedSession::TYPE_PHONE:
-      favicon_id = gfx::VectorIconId::SMARTPHONE;
+      favicon = &kSmartphoneIcon;
       break;
 
     case sync_sessions::SyncedSession::TYPE_TABLET:
-      favicon_id = gfx::VectorIconId::TABLET;
+      favicon = &kTabletIcon;
       break;
 
     case sync_sessions::SyncedSession::TYPE_CHROMEOS:
     case sync_sessions::SyncedSession::TYPE_WIN:
     case sync_sessions::SyncedSession::TYPE_MACOSX:
     case sync_sessions::SyncedSession::TYPE_LINUX:
     case sync_sessions::SyncedSession::TYPE_OTHER:
     case sync_sessions::SyncedSession::TYPE_UNSET:
-      favicon_id = gfx::VectorIconId::LAPTOP;
+      favicon = &kLaptopIcon;
       break;
   }
 
-  SetIcon(index_in_menu, CreateFavicon(favicon_id));
+  SetIcon(index_in_menu, CreateFavicon(*favicon));
 #endif
 }
 
 void RecentTabsSubMenuModel::AddTabFavicon(int command_id, const GURL& url) {
   bool is_local_tab = command_id < kFirstOtherDevicesTabCommandId;
   int index_in_menu = GetIndexOfCommandId(command_id);
 
   if (!is_local_tab) {
     // If tab has synced favicon, use it.
     // Note that currently, other devices' tabs only have favicons if
@@ skipping 91 matching lines @@
 
   ui::MenuModelDelegate* menu_model_delegate = GetMenuModelDelegate();
   if (menu_model_delegate)
     menu_model_delegate->OnMenuStructureChanged();
 }
 
 void RecentTabsSubMenuModel::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {
   TabRestoreServiceChanged(service);
 }