Vectorize tab recording and capturing icons.

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/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/multi_animation.h"
+#include "ui/gfx/image/image.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)

[miu, 2016/01/07 20:08:09]

nit: For readability, please negate the expression, swapping the then-clause
with the else-clause.

[Evan Stade, 2016/01/08 21:47:02]

Done.

 #include "ui/gfx/paint_vector_icon.h"
+#else
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 #endif
 
 struct LastMuteMetadata
     : public content::WebContentsUserData<LastMuteMetadata> {
   TabMutedReason reason = TAB_MUTED_REASON_NONE;
   std::string extension_id;
 
  private:
   explicit LastMuteMetadata(content::WebContents* contents) {}
   friend class content::WebContentsUserData<LastMuteMetadata>;
@@ skipping 120 matching lines @@
   if (contents->IsAudioMuted())
     return TAB_MEDIA_STATE_AUDIO_MUTING;
   if (contents->WasRecentlyAudible())
     return TAB_MEDIA_STATE_AUDIO_PLAYING;
 
   return TAB_MEDIA_STATE_NONE;
 }
 
 gfx::Image GetTabMediaIndicatorImage(TabMediaState media_state,
                                      SkColor button_color) {
+#if !defined(OS_MACOSX)

[miu, 2016/01/07 20:08:09]

ditto: negate expression for readability

[Evan Stade, 2016/01/08 21:47:02]

Done.

+  gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
+  switch (media_state) {
+    case TAB_MEDIA_STATE_AUDIO_PLAYING:
+      icon_id = gfx::VectorIconId::TAB_AUDIO;
+      break;
+    case TAB_MEDIA_STATE_AUDIO_MUTING:
+      icon_id = gfx::VectorIconId::TAB_AUDIO_MUTING;
+      break;
+    case TAB_MEDIA_STATE_RECORDING:
+      icon_id = gfx::VectorIconId::TAB_MEDIA_RECORDING;
+      break;
+    case TAB_MEDIA_STATE_CAPTURING:
+      icon_id = gfx::VectorIconId::TAB_MEDIA_CAPTURING;
+      break;
+    case TAB_MEDIA_STATE_NONE:
+      break;
+  }
+  if (icon_id != gfx::VectorIconId::VECTOR_ICON_NONE)
+    return gfx::Image(gfx::CreateVectorIcon(icon_id, 16, button_color));
+#else
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   switch (media_state) {
-#if !defined(OS_MACOSX)
-    case TAB_MEDIA_STATE_AUDIO_PLAYING:
-    case TAB_MEDIA_STATE_AUDIO_MUTING: {
-      return gfx::Image(
-          gfx::CreateVectorIcon(media_state == TAB_MEDIA_STATE_AUDIO_PLAYING
-                                    ? gfx::VectorIconId::TAB_AUDIO
-                                    : gfx::VectorIconId::TAB_AUDIO_MUTING,
-                                16, button_color));
-    }
-#else
     case TAB_MEDIA_STATE_AUDIO_PLAYING:
       return rb->GetNativeImageNamed(IDR_TAB_AUDIO_INDICATOR);
     case TAB_MEDIA_STATE_AUDIO_MUTING:
       return rb->GetNativeImageNamed(IDR_TAB_AUDIO_MUTING_INDICATOR);
-#endif
     case TAB_MEDIA_STATE_RECORDING:
       return rb->GetNativeImageNamed(IDR_TAB_RECORDING_INDICATOR);
     case TAB_MEDIA_STATE_CAPTURING:
       return rb->GetNativeImageNamed(IDR_TAB_CAPTURE_INDICATOR);
     case TAB_MEDIA_STATE_NONE:
       break;
   }
+#endif
   NOTREACHED();
   return gfx::Image();
 }
 
 gfx::Image GetTabMediaIndicatorAffordanceImage(TabMediaState media_state,
                                                SkColor button_color) {
   switch (media_state) {
     case TAB_MEDIA_STATE_AUDIO_PLAYING:
       return GetTabMediaIndicatorImage(TAB_MEDIA_STATE_AUDIO_MUTING,
                                        button_color);
@@ skipping 144 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