Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: trunk/src/chrome/browser/extensions/extension_assets_manager_chromeos.h

Issue 306023007: Revert 273763 "Add garbage collection for shared extensions on C..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/extensions/extension_assets_manager_chromeos.h
===================================================================
--- trunk/src/chrome/browser/extensions/extension_assets_manager_chromeos.h (revision 273797)
+++ trunk/src/chrome/browser/extensions/extension_assets_manager_chromeos.h (working copy)
@@ -5,15 +5,12 @@
#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ASSETS_MANAGER_CHROMEOS_H_
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_ASSETS_MANAGER_CHROMEOS_H_
-#include <map>
-
#include "chrome/browser/extensions/extension_assets_manager.h"
template <typename T> struct DefaultSingletonTraits;
class PrefRegistrySimple;
namespace base {
-class DictionaryValue;
class SequencedTaskRunner;
}
@@ -25,15 +22,9 @@
public:
static ExtensionAssetsManagerChromeOS* GetInstance();
- // A dictionary that maps shared extension IDs to version/paths/users.
- static const char kSharedExtensions[];
+ // Path to shared extensions install dir.
+ static const char kSharedExtensionsDir[];
- // Name of path attribute in shared extensions map.
- static const char kSharedExtensionPath[];
-
- // Name of users attribute (list of user emails) in shared extensions map.
- static const char kSharedExtensionUsers[];
-
// Register shared assets related preferences.
static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -49,16 +40,6 @@
const base::FilePath& local_install_dir,
const base::FilePath& extension_root) OVERRIDE;
- // Return shared install dir.
- static base::FilePath GetSharedInstallDir();
-
- // Cleans up shared extensions list in preferences and returns list of
- // extension IDs and version paths that are in use in |live_extension_paths|.
- // Files on disk are not removed. Must be called on UI thread.
- // Returns |false| in case of errors.
- static bool CleanUpSharedExtensions(
- std::multimap<std::string, base::FilePath>* live_extension_paths);
-
static void SetSharedInstallDirForTesting(const base::FilePath& install_dir);
private:
@@ -71,6 +52,9 @@
// the profile.
static base::SequencedTaskRunner* GetFileTaskRunner(Profile* profile);
+ // Return shared install dir.
+ static base::FilePath GetSharedInstallDir();
+
// Return |true| if |extension| can be installed in a shared place for all
// users on the device.
static bool CanShareAssets(const Extension* extension);
@@ -113,12 +97,6 @@
// Called on task runner thread to remove shared version.
static void DeleteSharedVersion(const base::FilePath& shared_version_dir);
- // Clean shared extension with given |id|.
- static bool CleanUpExtension(
- const std::string& id,
- base::DictionaryValue* extension_info,
- std::multimap<std::string, base::FilePath>* live_extension_paths);
-
DISALLOW_COPY_AND_ASSIGN(ExtensionAssetsManagerChromeOS);
};

Powered by Google App Engine
This is Rietveld 408576698