Clean up DriveAppRegistry (part 2 of 2).

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 <string>
 #include <vector>
@@ skipping 52 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 mapping between file content type selectors (extensions, MIME
-  // types) and corresponding app.
-  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 std::string& app_name,
-      const google_apis::InstalledApp::IconList& app_icons,
-      const google_apis::InstalledApp::IconList& document_icons,
-      const std::string& app_id,
-      const GURL& create_url,
-      const ScopedVector<std::string>& selectors,
-      DriveAppFileSelectorMap* map);
+  // Map of application id to each app's info.
+  std::map<std::string, DriveAppInfo> all_apps_;
 
-  // Finds matching |apps| from |map| based on provided file |selector|.
-  void FindAppsForSelector(const std::string& selector,
-                           const DriveAppFileSelectorMap& map,
-                           std::vector<DriveAppInfo*>* matched_apps) const;
+  // Defines mapping between file content type selectors (extensions, MIME
+  // types) and corresponding app.
+  typedef std::multimap<std::string, std::string> DriveAppFileSelectorMap;
+  DriveAppFileSelectorMap extension_map_;
+  DriveAppFileSelectorMap mimetype_map_;
 
   JobScheduler* scheduler_;
 
-  // 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.
   base::WeakPtrFactory<DriveAppRegistry> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(DriveAppRegistry);
 };
 
 namespace util {
 
 // The preferred icon size, which should usually be used for FindPreferredIcon;
 const int kPreferredIconSize = 16;
 
 // Finds an icon in the list of icons. If unable to find an icon of the exact
 // size requested, returns one with the next larger size. If all icons are
 // smaller than the preferred size, we'll return the largest one available.
 // 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_