| Index: chrome/installer/util/browser_distribution.h
|
| diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
|
| index 889482443037508ed7bc82f767845c9f1c90c2f5..0fe1cf23d7fd40747da4f56d0414ebea95e30224 100644
|
| --- a/chrome/installer/util/browser_distribution.h
|
| +++ b/chrome/installer/util/browser_distribution.h
|
| @@ -25,12 +25,6 @@ class AppRegistrationData;
|
|
|
| class BrowserDistribution {
|
| public:
|
| - // TODO(grt): Remove Type.
|
| - enum Type {
|
| - CHROME_BROWSER,
|
| - NUM_TYPES
|
| - };
|
| -
|
| enum Subfolder {
|
| SUBFOLDER_CHROME,
|
| SUBFOLDER_APPS,
|
| @@ -46,10 +40,6 @@ class BrowserDistribution {
|
|
|
| static BrowserDistribution* GetDistribution();
|
|
|
| - static BrowserDistribution* GetSpecificDistribution(Type type);
|
| -
|
| - Type GetType() const { return type_; }
|
| -
|
| // Getter and adaptors for the underlying |app_reg_data_|.
|
| const AppRegistrationData& GetAppRegistrationData() const;
|
| base::string16 GetAppGuid() const;
|
| @@ -155,15 +145,13 @@ class BrowserDistribution {
|
| virtual bool HasUserExperiments();
|
|
|
| protected:
|
| - BrowserDistribution(Type type,
|
| - std::unique_ptr<AppRegistrationData> app_reg_data);
|
| + explicit BrowserDistribution(
|
| + std::unique_ptr<AppRegistrationData> app_reg_data);
|
|
|
| template<class DistributionClass>
|
| static BrowserDistribution* GetOrCreateBrowserDistribution(
|
| BrowserDistribution** dist);
|
|
|
| - const Type type_;
|
| -
|
| std::unique_ptr<AppRegistrationData> app_reg_data_;
|
|
|
| private:
|
|
|