Move more vector icons into respective directories.

chrome/browser/ui/tabs/tab_utils.cc

 // Copyright (c) 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/tabs/tab_utils.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/usb/usb_tab_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #endif
 
 struct LastMuteMetadata
     : public content::WebContentsUserData<LastMuteMetadata> {
@@ skipping 133 matching lines @@
   if (contents->IsAudioMuted())
     return TabAlertState::AUDIO_MUTING;
   if (contents->WasRecentlyAudible())
     return TabAlertState::AUDIO_PLAYING;
 
   return TabAlertState::NONE;
 }
 
 gfx::Image GetTabAlertIndicatorImage(TabAlertState alert_state,
                                      SkColor button_color) {
-  gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
+  const gfx::VectorIcon* icon = nullptr;
   switch (alert_state) {
     case TabAlertState::AUDIO_PLAYING:
-      icon_id = gfx::VectorIconId::TAB_AUDIO;
+      icon = &kTabAudioIcon;
       break;
     case TabAlertState::AUDIO_MUTING:
-      icon_id = gfx::VectorIconId::TAB_AUDIO_MUTING;
+      icon = &kTabAudioMutingIcon;
       break;
     case TabAlertState::MEDIA_RECORDING:
-      icon_id = gfx::VectorIconId::TAB_MEDIA_RECORDING;
+      icon = &kTabMediaRecordingIcon;
       break;
     case TabAlertState::TAB_CAPTURING:
-      icon_id = gfx::VectorIconId::TAB_MEDIA_CAPTURING;
+      icon = &kTabMediaCapturingIcon;
       break;
     case TabAlertState::BLUETOOTH_CONNECTED:
-      icon_id = gfx::VectorIconId::TAB_BLUETOOTH_CONNECTED;
+      icon = &kTabBluetoothConnectedIcon;
       break;
     case TabAlertState::USB_CONNECTED:
-      icon_id = gfx::VectorIconId::TAB_USB_CONNECTED;
+      icon = &kTabUsbConnectedIcon;
       break;
     case TabAlertState::NONE:
-      break;
+      return gfx::Image();
   }
-  if (icon_id != gfx::VectorIconId::VECTOR_ICON_NONE)
-    return gfx::Image(gfx::CreateVectorIcon(icon_id, 16, button_color));
-
-  NOTREACHED();
-  return gfx::Image();
+  DCHECK(icon);
+  return gfx::Image(gfx::CreateVectorIcon(*icon, 16, button_color));
 }
 
 gfx::Image GetTabAlertIndicatorAffordanceImage(TabAlertState alert_state,
                                                SkColor button_color) {
   switch (alert_state) {
     case TabAlertState::AUDIO_PLAYING:
       return GetTabAlertIndicatorImage(TabAlertState::AUDIO_MUTING,
                                        button_color);
     case TabAlertState::AUDIO_MUTING:
       return GetTabAlertIndicatorImage(TabAlertState::AUDIO_PLAYING,
@@ skipping 156 matching lines @@
                      const std::vector<int>& indices) {
   for (std::vector<int>::const_iterator i = indices.begin(); i != indices.end();
        ++i) {
     if (!tab_strip.GetWebContentsAt(*i)->IsAudioMuted())
       return false;
   }
   return true;
 }
 
 }  // namespace chrome