Rollback 8998

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

1 files changed, 18 insertions, 68 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 8dbcfcd..79ea9c5 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -37,8 +37,6 @@ class SessionID;
 class SiteInstance;
 class SpellChecker;
 class TabContents;
-class TemplateURL;
-class TemplateURLRef;
 class URLRequestContext;
 class UserScriptMaster;
 class VisitedLinkMaster;
@@ -70,6 +68,24 @@ class MessageWindow {
   void Unlock() { }
 };
 
+class BrowserInit {
+ public:
+  static bool ProcessCommandLine(const CommandLine& parsed_command_line,
+                                 const std::wstring& cur_dir,
+                                 PrefService* prefs, bool process_startup,
+                                 Profile* profile, int* return_code);
+  static bool LaunchBrowser(const CommandLine& parsed_command_line,
+                            Profile* profile, const std::wstring& cur_dir,
+                            bool process_startup, int* return_code);
+ private:
+  static bool LaunchBrowserImpl(const CommandLine& parsed_command_line,
+                                Profile* profile, const std::wstring& cur_dir,
+                                bool process_startup, int* return_code);
+  static Browser* OpenURLsInBrowser(Browser* browser,
+                                    Profile* profile,
+                                    const std::vector<GURL>& urls);
+};
+
 class FirstRun {
  public:
   static bool IsChromeFirstRun() { return false; }
@@ -172,20 +188,6 @@ class SessionService : public base::RefCountedThreadSafe<SessionService> {
   void TabRestored(NavigationController*) { }
 };
 
-class SessionRestore {
- public:
-  static void RestoreSession(Profile* profile,
-                             Browser* browser,
-                             bool clobber_existing_window,
-                             bool always_create_tabbed_browser,
-                             const std::vector<GURL>& urls_to_open) {}
-  static void RestoreSessionSynchronously(
-      Profile* profile,
-      const std::vector<GURL>& urls_to_open) {}
-  
-  static size_t num_tabs_to_load_;
-};
-
 class TabRestoreService : public base::RefCountedThreadSafe<TabRestoreService> {
  public:
   explicit TabRestoreService(Profile* profile) { }
@@ -288,8 +290,6 @@ class NavigationController {
   NavigationEntry* GetActiveEntry() const { return entry_.get(); }
   void LoadURL(const GURL& url, const GURL& referrer,
                PageTransition::Type type) { }
-  static void DisablePromptOnRepost() {}
-  
  private:
   scoped_ptr<NavigationEntry> entry_;
 };
@@ -306,20 +306,6 @@ class InterstitialPage {
   virtual void DontProceed() { }
 };
 
-class InfoBarDelegate {
-};
-
-class ConfirmInfoBarDelegate : public InfoBarDelegate {
- public:
-  explicit ConfirmInfoBarDelegate(TabContents* contents) {}
-
-  enum InfoBarButton {
-    BUTTON_NONE = 0,
-    BUTTON_OK,
-    BUTTON_CANCEL
-  };
-};
-
 class RenderViewHost {
  public:
   bool HasUnloadListener() const { return false; }
@@ -347,9 +333,6 @@ class TabContents {
   static TabContents* CreateWithType(TabContentsType type,
                                      Profile* profile,
                                      SiteInstance* instance);
-  void AddInfoBar(InfoBarDelegate* delegate) {}
-  
-  Profile* profile() const { return NULL; }
  private:
   GURL url_;
   std::wstring title_;
@@ -450,30 +433,6 @@ class SpellChecker : public base::RefCountedThreadSafe<SpellChecker> {
                const std::wstring& custom_dictionary_file_name) {}
 };
 
-class WebAppLauncher {
- public:
-  static void Launch(Profile* profile, const GURL& url) {
-  }
-};
-
-class AutocompleteResult {
- public:
-  static void set_max_matches(int) { }
-};
-
-class AutocompleteProvider {
- public:
-  static void set_max_matches(int) {}
-};
-
-class URLFixerUpper {
- public:
-  static std::wstring FixupRelativeFile(const std::wstring& base_dir,
-                                        const std::wstring& text) {
-    return L"about:blank";
-  }
-};
-
 class TemplateURLModel {
  public:
   explicit TemplateURLModel(Profile* profile) { }
@@ -481,15 +440,6 @@ class TemplateURLModel {
     return L"";
   }
   static GURL GenerateSearchURL(const TemplateURL* t_url) { return GURL(); }
-  TemplateURL* GetDefaultSearchProvider() { return NULL; }
 };
 
-namespace chrome_browser_net {
-
-void EnableDnsDetailedLog(bool);
- 
-void EnableDnsPrefetch(bool);
-
-}  // namespace chrome_browser_net
-
 #endif  // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_