Remove drive::DriveAppRegistry::DriveAppFileSelector.

chrome/browser/chromeos/drive/drive_app_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_APP_REGISTRY_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_APP_REGISTRY_H_
 
 #include <map>
-#include <set>
 #include <string>
+#include <vector>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "url/gurl.h"
 
 namespace google_apis {
@@ skipping 48 matching lines @@
                       const std::string& mime_type,
                       ScopedVector<DriveAppInfo>* apps) const;
 
   // Updates this registry by fetching the data from the server.
   void Update();
 
   // Updates this registry from the |app_list|.
   void UpdateFromAppList(const google_apis::AppList& app_list);
 
  private:
-  // Defines application details that are associated with a given
-  // file extension or content mimetype.
-  struct DriveAppFileSelector {
-    DriveAppFileSelector(
-        const GURL& product_link,
-        const google_apis::InstalledApp::IconList& app_icons,
-        const google_apis::InstalledApp::IconList& document_icons,
-        const std::string& object_type,
-        const std::string& app_id,
-        bool is_primary_selector);
-    ~DriveAppFileSelector();
-    // Product link to the webstore.
-    GURL product_link;
-    // Drive application icon URLs for this app, paired with their size (length
-    // of a side in pixels).
-    google_apis::InstalledApp::IconList app_icons;
-    // Drive document icon URLs for this app, paired with their size (length of
-    // a side in pixels).
-    google_apis::InstalledApp::IconList document_icons;
-    // Object (file) type description.
-    std::string object_type;
-    // Drive app id
-    std::string app_id;
-    // True if the selector is the default one. The default selector should
-    // trigger on file double-click events. Non-default selectors only show up
-    // in "Open with..." pop-up menu.
-    bool is_primary_selector;
-  };
 
   // Defines mapping between file content type selectors (extensions, MIME
   // types) and corresponding app.
-  typedef std::multimap<std::string,
-                        DriveAppFileSelector*> DriveAppFileSelectorMap;
-
-  // Helper map used for deduplication of selector matching results.
-  typedef std::map<const DriveAppFileSelector*,
-                   DriveAppInfo*> SelectorAppList;
+  typedef std::multimap<std::string, DriveAppInfo*> DriveAppFileSelectorMap;
 
   // Part of Update(). Runs upon the completion of fetching the Drive apps
   // data from the server.
   void UpdateAfterGetAppList(google_apis::GDataErrorCode gdata_error,
                              scoped_ptr<google_apis::AppList> app_list);
 
   // Helper function for loading Drive application file |selectors| into
   // corresponding |map|.
   static void AddAppSelectorList(
-      const GURL& product_link,
+      const std::string& web_store_id,
+      const std::string& app_name,
       const google_apis::InstalledApp::IconList& app_icons,
       const google_apis::InstalledApp::IconList& document_icons,
       const std::string& object_type,
       const std::string& app_id,
       bool is_primary_selector,
       const ScopedVector<std::string>& selectors,
       DriveAppFileSelectorMap* map);
 
   // Finds matching |apps| from |map| based on provided file |selector|.
   void FindAppsForSelector(const std::string& selector,
                            const DriveAppFileSelectorMap& map,
-                           SelectorAppList* apps) const;
+                           std::vector<DriveAppInfo*>* matched_apps) const;
 
   JobScheduler* scheduler_;
 
-  // Map of web store product URL to application name.
-  std::map<GURL, std::string> url_to_name_map_;
-
   // Map of filename extension to application info.
   DriveAppFileSelectorMap app_extension_map_;
 
   // Map of MIME type to application info.
   DriveAppFileSelectorMap app_mimetypes_map_;
 
   bool is_updating_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
@@ skipping 12 matching lines @@
 // Icons do not have to be sorted by the icon size. If there are no icons in
 // the list, returns an empty URL.
 GURL FindPreferredIcon(const google_apis::InstalledApp::IconList& icons,
                        int preferred_size);
 
 }  // namespace util
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_APP_REGISTRY_H_