Remove old web app code it's no longer needed. Simplifies startup a little.

chrome/browser/browser_init.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_BROWSER_INIT_H_
 #define CHROME_BROWSER_BROWSER_INIT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 
 class Browser;
+class CommandLine;
 class GURL;
 class PrefService;
 class Profile;
 class TabContents;
 
 // Scoper class containing helpers for BrowserMain to spin up a new instance
 // and initialize the profile.
 class BrowserInit {
  public:
   // Returns true if the browser is coming up.
   static bool InProcessStartup();
 
   // LaunchWithProfile ---------------------------------------------------------
   //
   // Assists launching the application and appending the initial tabs for a
   // browser window.
 
   class LaunchWithProfile {
    public:
-    explicit LaunchWithProfile(const std::wstring& cur_dir);
+    LaunchWithProfile(const std::wstring& cur_dir,
+                      const CommandLine& command_line);
     ~LaunchWithProfile() { }
 
     // Creates the necessary windows for startup. Returns true on success,
     // false on failure. process_startup is true if Chrome is just
     // starting up. If process_startup is false, it indicates Chrome was
     // already running and the user wants to launch another instance.
     bool Launch(Profile* profile, bool process_startup);
 
    private:
+    // If the process was launched with the web application command line flag,
+    // e.g. --app=http://www.google.com/, opens a web application browser and
+    // returns true. If there is no web application command line flag speciifed,
+    // returns false to specify default processing.
+    bool OpenApplicationURL(Profile* profile);
+
     // Does the following:
     // . If the user's startup pref is to restore the last session (or the
     //   command line flag is present to force using last session), it is
     //   restored, and true is returned.
     // . If the user's startup pref is to launch a specific set of URLs, and
     //   urls_to_open is empty, the user specified set of URLs is openned.
     //
     // Otherwise false is returned.
     bool OpenStartupURLs(bool is_process_startup,
                          const std::vector<GURL>& urls_to_open);
 
     // Opens the list of urls. If browser is non-null and a tabbed browser, the
     // URLs are opened in it. Otherwise a new tabbed browser is created and the
     // URLs are added to it. The browser the tabs are added to is returned,
     // which is either |browser| or the newly created browser.
     Browser* OpenURLsInBrowser(Browser* browser,
                                bool process_startup,
                                const std::vector<GURL>& urls);
 
     // If the last session didn't exit cleanly and tab is a web contents tab,
     // an infobar is added allowing the user to restore the last session.
     void AddCrashedInfoBarIfNecessary(TabContents* tab);
 
     // Returns the list of URLs to open from the command line. The returned
     // vector is empty if the user didn't specify any URLs on the command line.
     std::vector<GURL> GetURLsFromCommandLine(Profile* profile);
 
+    // Adds additional startup URLs to the specified vector.
+    void AddStartupURLs(std::vector<GURL>* startup_urls) const;
+
     std::wstring cur_dir_;
+    const CommandLine& command_line_;
     Profile* profile_;
 
     DISALLOW_COPY_AND_ASSIGN(LaunchWithProfile);
   };
 
   // This function performs command-line handling and is invoked when
   // process starts as well as when we get a start request from another
-  // process (via the WM_COPYDATA message). The process_startup flag
-  // indicates if this is being called from the process startup code or
-  // the WM_COPYDATA handler.
-  static bool ProcessCommandLine(const std::wstring& cur_dir,
+  // process (via the WM_COPYDATA message). |command_line| holds the command
+  // line we need to process - either from this process or from some other one
+  // (if |process_startup| is true and we are being called from
+  //  MessageWindow::OnCopyData).
+  static bool ProcessCommandLine(const CommandLine& command_line,
+                                 const std::wstring& cur_dir,
                                  PrefService* prefs, bool process_startup,
                                  Profile* profile, int* return_code);
 
   // Helper function to launch a new browser based on command-line arguments
   // This function takes in a specific profile to use.
-  static bool LaunchBrowser(Profile* profile, const std::wstring& cur_dir,
+  static bool LaunchBrowser(const CommandLine& command_line,
+                            Profile* profile, const std::wstring& cur_dir,
                             bool process_startup, int* return_code);
 
 #if defined(OS_WIN)
   template <class AutomationProviderClass>
   static void CreateAutomationProvider(const std::wstring& channel_id,
                                        Profile* profile,
                                        size_t expected_tabs);
 #endif
 
  private:
   // Does the work of LaunchBrowser returning the result.
-  static bool LaunchBrowserImpl(Profile* profile, const std::wstring& cur_dir,
+  static bool LaunchBrowserImpl(const CommandLine& command_line,
+                                Profile* profile, const std::wstring& cur_dir,
                                 bool process_startup, int* return_code);
 
   // This class is for scoping purposes.
   BrowserInit();
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_INIT_H_