Change the media galleries permission dialog to have a suggestions section.

chrome/browser/media_galleries/media_galleries_permission_controller.cc

 // Copyright 2014 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_galleries/media_galleries_permission_controller.h"
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/text/bytes_formatting.h"
 
 using extensions::APIPermission;
 using extensions::Extension;
 using storage_monitor::StorageInfo;
 using storage_monitor::StorageMonitor;
 
 namespace {
 
-// Comparator for sorting GalleryPermissionsVector -- sorts
-// selected galleries low, and then sorts by absolute path.
+// Comparator for sorting gallery entries. Sort Removable entries above
+// non-removable ones. Within those two groups, sort on media counts
+// if populated, otherwise on paths.
 bool GalleriesVectorComparator(
     const MediaGalleriesDialogController::Entry& a,
     const MediaGalleriesDialogController::Entry& b) {
-  if (a.selected && !b.selected)
-    return true;
-  if (!a.selected && b.selected)
-    return false;
-
+  if (StorageInfo::IsRemovableDevice(a.pref_info.device_id) !=
+      StorageInfo::IsRemovableDevice(b.pref_info.device_id)) {
+    return StorageInfo::IsRemovableDevice(a.pref_info.device_id);
+  }
+  int a_media_count = a.pref_info.audio_count + a.pref_info.image_count +
+      a.pref_info.video_count;
+  int b_media_count = b.pref_info.audio_count + b.pref_info.image_count +
+      b.pref_info.video_count;
+  if (a_media_count != b_media_count)
+    return a_media_count > b_media_count;
   return a.pref_info.AbsolutePath() < b.pref_info.AbsolutePath();
 }
 
 }  // namespace
 
 MediaGalleriesPermissionController::MediaGalleriesPermissionController(
     content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
       : web_contents_(web_contents),
@@ skipping 100 matching lines @@
 bool MediaGalleriesPermissionController::ShouldShowFolderViewer(
     const Entry& entry) const {
   return false;
 }
 
 std::vector<base::string16>
 MediaGalleriesPermissionController::GetSectionHeaders() const {
   std::vector<base::string16> result;
   result.push_back(base::string16());  // First section has no header.
   result.push_back(
-      l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_UNATTACHED_LOCATIONS));
+      l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_PERMISSION_SUGGESTIONS));
   return result;
 }
 
 // Note: sorts by display criterion: GalleriesVectorComparator.
 MediaGalleriesDialogController::Entries
 MediaGalleriesPermissionController::GetSectionEntries(size_t index) const {
   DCHECK_GT(2U, index);  // This dialog only has two sections.
 
-  // TODO(vandebo): Change this to be permitted/non-permitted instead of
-  // attached/non-attached.
-  bool attached = !index;
+  bool existing = !index;
   MediaGalleriesDialogController::Entries result;
   for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin();
        iter != known_galleries_.end(); ++iter) {
+    MediaGalleryPrefId pref_id = GetPrefId(iter->first);
     if (!ContainsKey(forgotten_galleries_, iter->first) &&
-        attached == iter->second.pref_info.IsGalleryAvailable()) {
+        existing == ContainsKey(pref_permitted_galleries_, pref_id)) {
       result.push_back(iter->second);
     }
   }
-  for (GalleryPermissionsMap::const_iterator iter = new_galleries_.begin();
-       iter != new_galleries_.end(); ++iter) {
-    if (attached == iter->second.pref_info.IsGalleryAvailable()) {
+  if (existing) {
+    for (GalleryPermissionsMap::const_iterator iter = new_galleries_.begin();
+         iter != new_galleries_.end(); ++iter) {
       result.push_back(iter->second);
     }
   }
 
   std::sort(result.begin(), result.end(), GalleriesVectorComparator);
   return result;
 }
 
 base::string16
 MediaGalleriesPermissionController::GetAuxiliaryButtonText() const {
@@ skipping 22 matching lines @@
 
 void MediaGalleriesPermissionController::DidToggleEntry(
     GalleryDialogId gallery_id, bool selected) {
   // Check known galleries.
   GalleryPermissionsMap::iterator iter = known_galleries_.find(gallery_id);
   if (iter != known_galleries_.end()) {
     if (iter->second.selected == selected)
       return;
 
     iter->second.selected = selected;
-    if (ContainsKey(toggled_galleries_, gallery_id))
-      toggled_galleries_.erase(gallery_id);
-    else
-      toggled_galleries_.insert(gallery_id);
+    toggled_galleries_[gallery_id] = selected;
     return;
   }
 
   iter = new_galleries_.find(gallery_id);
   if (iter != new_galleries_.end())
     iter->second.selected = selected;
 
   // Don't sort -- the dialog is open, and we don't want to adjust any
   // positions for future updates to the dialog contents until they are
   // redrawn.
@@ skipping 144 matching lines @@
        ++iter) {
     const MediaGalleryPrefInfo& gallery = iter->second;
     if (gallery.IsBlackListedType())
       continue;
 
     GalleryDialogId gallery_id = GetDialogId(gallery.pref_id);
     known_galleries_[gallery_id] = Entry(gallery, false);
     known_galleries_[gallery_id].pref_info.pref_id = gallery_id;
   }
 
-  MediaGalleryPrefIdSet permitted =
-      preferences_->GalleriesForExtension(*extension_);
+  pref_permitted_galleries_ = preferences_->GalleriesForExtension(*extension_);
 
-  for (MediaGalleryPrefIdSet::iterator iter = permitted.begin();
-       iter != permitted.end(); ++iter) {
+  for (MediaGalleryPrefIdSet::iterator iter = pref_permitted_galleries_.begin();
+       iter != pref_permitted_galleries_.end();
+       ++iter) {
     GalleryDialogId gallery_id = GetDialogId(*iter);
-    if (ContainsKey(toggled_galleries_, gallery_id))
-      continue;
     DCHECK(ContainsKey(known_galleries_, gallery_id));
     known_galleries_[gallery_id].selected = true;
   }
+
+  // Preserve state of toggled galleries.
+  for (ToggledGalleryMap::const_iterator iter = toggled_galleries_.begin();
+       iter != toggled_galleries_.end();
+       ++iter) {
+    known_galleries_[iter->first].selected = iter->second;
+  }
 }
 
 void MediaGalleriesPermissionController::SavePermissions() {
   DCHECK(preferences_);
   media_galleries::UsageCount(media_galleries::SAVE_DIALOG);
   for (GalleryPermissionsMap::const_iterator iter = known_galleries_.begin();
        iter != known_galleries_.end(); ++iter) {
     MediaGalleryPrefId pref_id = GetPrefId(iter->first);
     if (ContainsKey(forgotten_galleries_, iter->first)) {
       preferences_->ForgetGalleryById(pref_id);
@@ skipping 74 matching lines @@
   context_menu_->set_pref_id(gallery_id);
   return context_menu_.get();
 }
 
 GalleryDialogId MediaGalleriesPermissionController::GetDialogId(
     MediaGalleryPrefId pref_id) {
   return id_map_.GetDialogId(pref_id);
 }
 
 MediaGalleryPrefId MediaGalleriesPermissionController::GetPrefId(
-    GalleryDialogId id) {
+    GalleryDialogId id) const {
   return id_map_.GetPrefId(id);
 }
 
 Profile* MediaGalleriesPermissionController::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }
 
 MediaGalleriesPermissionController::DialogIdMap::DialogIdMap()
     : next_dialog_id_(1) {
   // Dialog id of 0 is invalid, so fill the slot.
@@ skipping 14 matching lines @@
   GalleryDialogId result = next_dialog_id_++;
   DCHECK_EQ(result, forward_mapping_.size());
   forward_mapping_.push_back(pref_id);
   if (pref_id != kInvalidMediaGalleryPrefId)
     back_map_[pref_id] = result;
   return result;
 }
 
 MediaGalleryPrefId
 MediaGalleriesPermissionController::DialogIdMap::GetPrefId(
-    GalleryDialogId id) {
+    GalleryDialogId id) const {
   DCHECK_LT(id, next_dialog_id_);
   return forward_mapping_[id];
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}