Desktop Capture Picker New UI: Non Mac Appearance Change

chrome/browser/media/tab_desktop_media_list.cc

 // Copyright 2016 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/media/tab_desktop_media_list.h"
 
 #include "base/hash.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 gfx::ImageSkia CreateEnclosedFaviconImage(gfx::Size size,
                                           const gfx::ImageSkia& favicon) {
   DCHECK_GE(size.width(), 20);
   DCHECK_GE(size.height(), 20);
 
   // Create a bitmap.
   SkBitmap result;
-  result.allocN32Pixels(size.width(), size.height(), true);
+  result.allocN32Pixels(size.width(), size.height(), false);
   SkCanvas canvas(result);
-
-  // White background.
-  canvas.drawARGB(255, 255, 255, 255);
-
-  // Black border.
-  const int thickness = 5;
-  SkPaint paint;
-  paint.setARGB(255, 0, 0, 0);
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setStrokeWidth(thickness);
-  canvas.drawRectCoords(thickness,                    // left
-                        thickness,                    // top
-                        result.width() - thickness,   // right
-                        result.height() - thickness,  // bottom
-                        paint);
+  canvas.clear(SK_ColorTRANSPARENT);
 
   // Draw the favicon image into the center of result image. If the favicon is
   // too big, scale it down.
   gfx::Size fill_size = favicon.size();
-  const double fraction = 0.75;
-  if (result.width() * fraction < favicon.width() ||
-      result.height() * fraction < favicon.height()) {
-    gfx::Size target_size(result.width() * fraction,
-                          result.height() * fraction);
-    fill_size = media::ScaleSizeToFitWithinTarget(favicon.size(), target_size);
-  }
+  if (result.width() < favicon.width() || result.height() < favicon.height())
+    fill_size = media::ScaleSizeToFitWithinTarget(favicon.size(), size);
+
   gfx::Rect center_rect(result.width(), result.height());
   center_rect.ClampToCenteredSize(fill_size);
   SkRect dest_rect =
       SkRect::MakeLTRB(center_rect.x(), center_rect.y(), center_rect.right(),
                        center_rect.bottom());
   const std::unique_ptr<SkImage> bitmap(
       SkImage::NewFromBitmap(*favicon.bitmap()));
   canvas.drawImageRect(bitmap.get(), dest_rect, nullptr);
 
   return gfx::ImageSkia::CreateFrom1xBitmap(result);
@@ skipping 41 matching lines @@
       // Create id for tab.
       content::WebContents* contents = tab_strip_model->GetWebContentsAt(i);
       DCHECK(contents);
       content::RenderFrameHost* main_frame = contents->GetMainFrame();
       DCHECK(main_frame);
       DesktopMediaID media_id(
           DesktopMediaID::TYPE_WEB_CONTENTS, DesktopMediaID::kNullId,
           content::WebContentsMediaCaptureId(main_frame->GetProcess()->GetID(),
                                              main_frame->GetRoutingID()));
 
-      // Create display tab title.
-      const base::string16 title = l10n_util::GetStringFUTF16(
-          IDS_DESKTOP_MEDIA_PICKER_CHROME_TAB_TITLE, contents->GetTitle());
-
       // Get tab's last active time stamp.
       const base::TimeTicks t = contents->GetLastActiveTime();
-      tab_map.insert(std::make_pair(t, SourceDescription(media_id, title)));
+      tab_map.insert(
+          std::make_pair(t, SourceDescription(media_id, contents->GetTitle())));
 
       // Get favicon for tab.
       favicon::FaviconDriver* favicon_driver =
           favicon::ContentFaviconDriver::FromWebContents(contents);
       if (!favicon_driver)
         continue;
 
       gfx::Image favicon = favicon_driver->GetFavicon();
       if (favicon.IsEmpty())
         continue;
@@ skipping 28 matching lines @@
 
   // ScheduleNextRefresh() needs to be called after all calls for
   // UpdateSourceThumbnail() have done. Therefore, a DoNothing task is posted
   // to the same sequenced task runner that CreateEnlargedFaviconImag()
   // is posted.
   thumbnail_task_runner_.get()->PostTaskAndReply(
       FROM_HERE, base::Bind(&base::DoNothing),
       base::Bind(&TabDesktopMediaList::ScheduleNextRefresh,
                  weak_factory_.GetWeakPtr()));
 }