Address review

electron · Jan 11, 2021 · c03b688 · c03b688
1 parent 1339296
commit c03b688
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc
@@ -658,7 +658,7 @@ bool Browser::SetBadgeCount(base::Optional<int> count) {
 }
 
 void Browser::UpdateBadgeContents(HWND hwnd) {
-  auto badge = std::make_unique<SkBitmap>();
+  SkBitmap badge;
   if (badge_content_) {
     std::string content = badge_content_.value();
     constexpr int kOverlayIconSize = 16;
@@ -674,9 +674,8 @@ void Browser::UpdateBadgeContents(HWND hwnd) {
     constexpr int kMaxTextSize = 24;  // Max size for our text.
     constexpr int kMinTextSize = 7;   // Min size for our text.
 
-    badge->allocN32Pixels(kOverlayIconSize, kOverlayIconSize);
-    SkCanvas canvas(*badge.get(),
-                    skia::LegacyDisplayGlobals::GetSkSurfaceProps());
+    badge.allocN32Pixels(kOverlayIconSize, kOverlayIconSize);
+    SkCanvas canvas(badge, skia::LegacyDisplayGlobals::GetSkSurfaceProps());
 
     SkPaint paint;
     paint.setAntiAlias(true);
@@ -706,7 +705,7 @@ void Browser::UpdateBadgeContents(HWND hwnd) {
         kRadius - bounds.width() / 2 - bounds.x(),
         kRadius - bounds.height() / 2 - bounds.y(), font, paint);
   }
-  taskbar_host_.SetOverlayIcon(hwnd, badge.get(), badge_alt_string_);
+  taskbar_host_.SetOverlayIcon(hwnd, badge, badge_alt_string_);
 }
 
 void Browser::SetLoginItemSettings(LoginItemSettings settings) {

diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
@@ -1209,7 +1209,7 @@ void NativeWindowViews::SetOverlayIcon(const gfx::Image& overlay,
                                        const std::string& description) {
 #if defined(OS_WIN)
   SkBitmap overlay_bitmap = overlay.AsBitmap();
-  taskbar_host_.SetOverlayIcon(GetAcceleratedWidget(), &overlay_bitmap,
+  taskbar_host_.SetOverlayIcon(GetAcceleratedWidget(), overlay_bitmap,
                                description);
 #endif
 }

diff --git a/shell/browser/ui/win/taskbar_host.cc b/shell/browser/ui/win/taskbar_host.cc
@@ -166,12 +166,12 @@ bool TaskbarHost::SetProgressBar(HWND window,
 }
 
 bool TaskbarHost::SetOverlayIcon(HWND window,
-                                 SkBitmap* overlay,
+                                 const SkBitmap& overlay,
                                  const std::string& text) {
   if (!InitializeTaskbar())
     return false;
 
-  base::win::ScopedHICON icon(IconUtil::CreateHICONFromSkBitmap(*overlay));
+  base::win::ScopedHICON icon(IconUtil::CreateHICONFromSkBitmap(overlay));
   return SUCCEEDED(taskbar_->SetOverlayIcon(window, icon.get(),
                                             base::UTF8ToUTF16(text).c_str()));
 }

diff --git a/shell/browser/ui/win/taskbar_host.h b/shell/browser/ui/win/taskbar_host.h
@@ -47,7 +47,9 @@ class TaskbarHost {
                       const NativeWindow::ProgressState state);
 
   // Set the overlay icon in taskbar.
-  bool SetOverlayIcon(HWND window, SkBitmap* overlay, const std::string& text);
+  bool SetOverlayIcon(HWND window,
+                      const SkBitmap& overlay,
+                      const std::string& text);
 
   // Set the region of the window to show as a thumbnail in taskbar.
   bool SetThumbnailClip(HWND window, const gfx::Rect& region);