From 6e0cb2f3ad6d92ebc29b9727be0583a0fb9d621f Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Sat, 12 Nov 2011 17:20:15 +0000 Subject: Cleanup: Remove unneeded forward declarations in chrome/installer. BUG=none TEST=none Review URL: http://codereview.chromium.org/8511053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109804 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/setup/chrome_frame_ready_mode.h | 2 -- chrome/installer/setup/install.h | 1 - chrome/installer/setup/install_worker.h | 1 - chrome/installer/setup/uninstall.h | 1 - chrome/installer/util/app_commands.h | 2 -- chrome/installer/util/browser_distribution.h | 4 ---- chrome/installer/util/chrome_frame_distribution.h | 4 ---- chrome/installer/util/google_chrome_sxs_distribution.h | 6 +----- chrome/installer/util/helper.h | 1 - chrome/installer/util/installation_state.h | 1 - chrome/installer/util/installation_validator.h | 5 +---- chrome/installer/util/product.h | 1 + chrome/installer/util/registry_key_backup.h | 8 -------- 13 files changed, 3 insertions(+), 34 deletions(-) diff --git a/chrome/installer/setup/chrome_frame_ready_mode.h b/chrome/installer/setup/chrome_frame_ready_mode.h index 2541bb8..430b3a1 100644 --- a/chrome/installer/setup/chrome_frame_ready_mode.h +++ b/chrome/installer/setup/chrome_frame_ready_mode.h @@ -8,8 +8,6 @@ #define CHROME_INSTALLER_SETUP_CHROME_FRAME_READY_MODE_H_ #pragma once -class CommandLine; - namespace installer { enum InstallStatus; diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h index 623e343..370c51e 100644 --- a/chrome/installer/setup/install.h +++ b/chrome/installer/setup/install.h @@ -16,7 +16,6 @@ #include "chrome/installer/util/util_constants.h" class FilePath; -class WorkItemList; namespace installer { diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h index 3da3066..2e9dfd4 100644 --- a/chrome/installer/setup/install_worker.h +++ b/chrome/installer/setup/install_worker.h @@ -25,7 +25,6 @@ namespace installer { class InstallationState; class InstallerState; -class Package; class Product; // Helper function for AddGoogleUpdateWorkItems that mirrors oeminstall. diff --git a/chrome/installer/setup/uninstall.h b/chrome/installer/setup/uninstall.h index ef5c4ef..a531646 100644 --- a/chrome/installer/setup/uninstall.h +++ b/chrome/installer/setup/uninstall.h @@ -17,7 +17,6 @@ class BrowserDistribution; class CommandLine; class FilePath; -class InstallUtil; namespace installer { diff --git a/chrome/installer/util/app_commands.h b/chrome/installer/util/app_commands.h index cff16aa..357bbd3 100644 --- a/chrome/installer/util/app_commands.h +++ b/chrome/installer/util/app_commands.h @@ -15,8 +15,6 @@ #include "base/basictypes.h" #include "chrome/installer/util/app_command.h" -class WorkItemList; - namespace base { namespace win { class RegKey; diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h index 58ab51c..81a291b 100644 --- a/chrome/installer/util/browser_distribution.h +++ b/chrome/installer/util/browser_distribution.h @@ -20,11 +20,7 @@ #include // NOLINT #endif -class CommandLine; - namespace installer { -class ChannelInfo; -class MasterPreferences; class Product; } diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h index e5124a8..6b037ae 100644 --- a/chrome/installer/util/chrome_frame_distribution.h +++ b/chrome/installer/util/chrome_frame_distribution.h @@ -15,10 +15,6 @@ #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/util_constants.h" -namespace installer { -class MasterPreferences; -} - class ChromeFrameDistribution : public BrowserDistribution { public: virtual std::wstring GetAppGuid() OVERRIDE; diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h index 1e6a6174..cd5c039 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.h +++ b/chrome/installer/util/google_chrome_sxs_distribution.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -11,10 +11,6 @@ #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/util_constants.h" -namespace installer { -class MasterPreferences; -} - // GoogleChromeSxSDistribution encapsulates properties of Google Chrome Sxs // distribution which can co-exist with other Google Chrome distributions. // Google Chrome Sxs distribution is installed to a different path, runs diff --git a/chrome/installer/util/helper.h b/chrome/installer/util/helper.h index fa996b6..9237e54 100644 --- a/chrome/installer/util/helper.h +++ b/chrome/installer/util/helper.h @@ -11,7 +11,6 @@ #include class BrowserDistribution; -class CommandLine; class FilePath; namespace installer { diff --git a/chrome/installer/util/installation_state.h b/chrome/installer/util/installation_state.h index 889e64e..bc7e01a 100644 --- a/chrome/installer/util/installation_state.h +++ b/chrome/installer/util/installation_state.h @@ -27,7 +27,6 @@ class RegKey; namespace installer { class InstallationState; -class MasterPreferences; // A representation of a product's state on the machine based on the contents // of the Windows registry. diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h index 721f6ca..519718e 100644 --- a/chrome/installer/util/installation_validator.h +++ b/chrome/installer/util/installation_validator.h @@ -13,13 +13,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "chrome/installer/util/browser_distribution.h" -#include "chrome/installer/util/channel_info.h" +class CommandLine; class FilePath; -class Version; namespace installer { diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h index c136a54..194e07a 100644 --- a/chrome/installer/util/product.h +++ b/chrome/installer/util/product.h @@ -17,6 +17,7 @@ class CommandLine; namespace installer { +class ChannelInfo; class MasterPreferences; class Product; class ProductOperations; diff --git a/chrome/installer/util/registry_key_backup.h b/chrome/installer/util/registry_key_backup.h index 0d65b2f..d9332f0 100644 --- a/chrome/installer/util/registry_key_backup.h +++ b/chrome/installer/util/registry_key_backup.h @@ -8,17 +8,9 @@ #include -#include - #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -namespace base { -namespace win { -class RegKey; -} // namespace win -} // namespace base - // A container for a registry key, its values, and its subkeys. We don't use // more obvious methods for various reasons: // - RegCopyTree isn't supported pre-Vista, so we'd have to do something -- cgit v1.1