CommandLine API rework

chrome/browser/browser_init.cc

 // 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.
 
 #include "chrome/browser/browser_init.h"
 
 #include <shellapi.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 385 matching lines @@
                                                   const std::wstring& cmd_line)
     : command_line_(cmd_line),
       cur_dir_(cur_dir) {
 }
 
 bool BrowserInit::LaunchWithProfile::Launch(Profile* profile,
                                             bool process_startup) {
   DCHECK(profile);
   profile_ = profile;
 
-  CommandLine parsed_command_line(command_line_);
+  CommandLine parsed_command_line(L"");
+  parsed_command_line.ParseFromString(command_line_);
   if (parsed_command_line.HasSwitch(switches::kDnsLogDetails))
     chrome_browser_net::EnableDnsDetailedLog(true);
   if (parsed_command_line.HasSwitch(switches::kDnsPrefetchDisable))
     chrome_browser_net::EnableDnsPrefetch(false);
 
   if (parsed_command_line.HasSwitch(switches::kDumpHistogramsOnExit)) {
     StatisticsRecorder::set_dump_on_exit(true);
   }
 
   if (parsed_command_line.HasSwitch(switches::kRemoteShellPort)) {
@@ skipping 145 matching lines @@
     // The last session didn't exit cleanly. Show an infobar to the user
     // so that they can restore if they want. The delegate deletes itself when
     // it is closed.
     tab->AddInfoBar(new SessionCrashedInfoBarDelegate(tab));
   }
 }
 
 std::vector<GURL> BrowserInit::LaunchWithProfile::GetURLsFromCommandLine(
     const CommandLine& command_line, Profile* profile) {
   std::vector<GURL> urls;
-  if (command_line.GetLooseValueCount() > 0) {
-    for (CommandLine::LooseValueIterator iter =
-         command_line.GetLooseValuesBegin();
-         iter != command_line.GetLooseValuesEnd(); ++iter) {
-      std::wstring value = *iter;
-      // Handle Vista way of searching - "? <search-term>"
-      if (value.find(L"? ") == 0) {
-        const TemplateURL* const default_provider =
-            profile->GetTemplateURLModel()->GetDefaultSearchProvider();
-        if (!default_provider || !default_provider->url()) {
-          // No search provider available. Just treat this as regular URL.
-          urls.push_back(GURL(URLFixerUpper::FixupRelativeFile(cur_dir_,
-                                                               value)));
-          continue;
-        }
-        const TemplateURLRef* const search_url = default_provider->url();
-        DCHECK(search_url->SupportsReplacement());
-        urls.push_back(GURL(search_url->ReplaceSearchTerms(*default_provider,
-            value.substr(2), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
-            std::wstring())));
-      } else {
-        // This will create a file URL or a regular URL.
-        urls.push_back(GURL(URLFixerUpper::FixupRelativeFile(cur_dir_, value)));
+  std::vector<std::wstring> params = command_line.GetLooseValues();
+  for (size_t i = 0; i < params.size(); ++i) {
+    const std::wstring& value = params[i];
+    // Handle Vista way of searching - "? <search-term>"
+    if (value.find(L"? ") == 0) {
+      const TemplateURL* const default_provider =
+          profile->GetTemplateURLModel()->GetDefaultSearchProvider();
+      if (!default_provider || !default_provider->url()) {
+        // No search provider available. Just treat this as regular URL.
+        urls.push_back(GURL(URLFixerUpper::FixupRelativeFile(cur_dir_,
+                                                             value)));
+        continue;
       }
+      const TemplateURLRef* const search_url = default_provider->url();
+      DCHECK(search_url->SupportsReplacement());
+      urls.push_back(GURL(search_url->ReplaceSearchTerms(*default_provider,
+          value.substr(2), TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
+          std::wstring())));
+    } else {
+      // This will create a file URL or a regular URL.
+      urls.push_back(GURL(URLFixerUpper::FixupRelativeFile(cur_dir_, value)));
     }
   }
   return urls;
 }
 
 bool BrowserInit::ProcessCommandLine(const CommandLine& parsed_command_line,
     const std::wstring& cur_dir, PrefService* prefs, bool process_startup,
     Profile* profile, int* return_code) {
   DCHECK(profile);
   if (process_startup) {
@@ skipping 20 matching lines @@
     if (parsed_command_line.HasSwitch(switches::kTestingChannelID)) {
       std::wstring testing_channel_id =
         parsed_command_line.GetSwitchValue(switches::kTestingChannelID);
       // TODO(sanjeevr) Check if we need to make this a singleton for
       // compatibility with the old testing code
       // If there are any loose parameters, we expect each one to generate a
       // new tab; if there are none then we get one homepage tab.
       CreateAutomationProvider<TestingAutomationProvider>(
           testing_channel_id,
           profile,
-          std::max(static_cast<int>(parsed_command_line.GetLooseValueCount()),
+          std::max(static_cast<int>(parsed_command_line.GetLooseValues().size()),
                    1));
     }
   }
 
   // Allow the command line to override the persisted setting of home page.
   SetOverrideHomePage(parsed_command_line, profile->GetPrefs());
 
   if (parsed_command_line.HasSwitch(switches::kBrowserStartRenderersManually))
     prefs->transient()->SetBoolean(prefs::kStartRenderersManually, true);
 
   bool silent_launch = false;
   if (parsed_command_line.HasSwitch(switches::kAutomationClientChannelID)) {
     std::wstring automation_channel_id =
       parsed_command_line.GetSwitchValue(switches::kAutomationClientChannelID);
     // If there are any loose parameters, we expect each one to generate a
     // new tab; if there are none then we have no tabs
     size_t expected_tabs =
-        std::max(static_cast<int>(parsed_command_line.GetLooseValueCount()),
+        std::max(static_cast<int>(parsed_command_line.GetLooseValues().size()),
                  0);
     if (expected_tabs == 0) {
       silent_launch = true;
     }
     CreateAutomationProvider<AutomationProvider>(automation_channel_id,
                                                  profile, expected_tabs);
   }
   // If we don't want to launch a new browser window or tab (in the case
   // of an automation request), we are done here.
   if (!silent_launch) {
@@ skipping 59 matching lines @@
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL) {
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     }
     return false;
   }
 
   return true;
 }