commit 4573fbd30d7ed70f959efb69b32ad9547465f0ce
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 31 20:25:18 2011
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Oct 31 20:25:18 2011
tree 958d424cf2dfa7b22aba942c8ebc383a5ba22517
parent 5262dc192af688c4f9301753fa7890975303b909

Move content_restriction.h and main_function_params.h to content/public/common, and put them in the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8387039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108004 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main.h

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 817e8dec..13f06750 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -23,7 +23,6 @@
 class Profile;
 class ShutdownWatcherHelper;
 class TranslateManager;
-struct MainFunctionParams;
 
 namespace chrome_browser {
 // For use by ShowMissingLocaleMessageBox.
@@ -31,6 +30,10 @@
 extern const char kMissingLocaleDataMessage[];
 }
 
+namespace content {
+struct MainFunctionParams;
+}
+
 class ChromeBrowserMainParts : public content::BrowserMainParts {
  public:
   virtual ~ChromeBrowserMainParts();
@@ -40,7 +43,7 @@
   // switches.
   MetricsService* SetupMetricsAndFieldTrials(PrefService* local_state);
 
-  const MainFunctionParams& parameters() const {
+  const content::MainFunctionParams& parameters() const {
     return parameters_;
   }
   const CommandLine& parsed_command_line() const {
@@ -48,7 +51,8 @@
   }
 
  protected:
-  explicit ChromeBrowserMainParts(const MainFunctionParams& parameters);
+  explicit ChromeBrowserMainParts(
+      const content::MainFunctionParams& parameters);
 
   // content::BrowserParts overrides
   virtual void PreEarlyInitialization() OVERRIDE {}
@@ -109,7 +113,7 @@
 
   // Members initialized on construction ---------------------------------------
 
-  const MainFunctionParams& parameters_;
+  const content::MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;