CommandLine API rework

chrome/browser/browser.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 <windows.h>
 #include <shellapi.h>
 
 #include "chrome/browser/browser.h"
 
 #include "base/command_line.h"
@@ skipping 324 matching lines @@
   // the session service. This function gets called during initial window
   // showing, and we don't want to bring in the session service this early.
   if (profile()->HasSessionService()) {
     SessionService* session_service = profile()->GetSessionService();
     if (session_service)
       session_service->SetWindowBounds(session_id_, bounds, maximized);
   }
 }
 
 gfx::Rect Browser::GetSavedWindowBounds() const {
-  CommandLine parsed_command_line;
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   bool record_mode = parsed_command_line.HasSwitch(switches::kRecordMode);
   bool playback_mode = parsed_command_line.HasSwitch(switches::kPlaybackMode);
   if (record_mode || playback_mode) {
     // In playback/record mode we always fix the size of the browser and
     // move it to (0,0).  The reason for this is two reasons:  First we want
     // resize/moves in the playback to still work, and Second we want
     // playbacks to work (as much as possible) on machines w/ different
     // screen sizes.
     return gfx::Rect(0, 0, 800, 600);
   }
 
   gfx::Rect restored_bounds = override_bounds_;
   bool maximized;
   WindowSizer::GetBrowserWindowBounds(app_name_, restored_bounds,
                                       &restored_bounds, &maximized);
   return restored_bounds;
 }
 
 // TODO(beng): obtain maximized state some other way so we don't need to go
 //             through all this hassle.
 bool Browser::GetSavedMaximizedState() const {
-  if (CommandLine().HasSwitch(switches::kStartMaximized))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
     return true;
 
   gfx::Rect restored_bounds;
   bool maximized = override_maximized_;
   WindowSizer::GetBrowserWindowBounds(app_name_, restored_bounds,
                                       &restored_bounds, &maximized);
   return maximized;
 }
 
 SkBitmap Browser::GetCurrentPageIcon() const {
@@ skipping 1115 matching lines @@
 
   // If the URL is part of the same web site, then load it in the same
   // SiteInstance (and thus the same process).  This is an optimization to
   // reduce process overhead; it is not necessary for compatibility.  (That is,
   // the new tab will not have script connections to the previous tab, so it
   // does not need to be part of the same SiteInstance or BrowsingInstance.)
   // Default to loading in a new SiteInstance and BrowsingInstance.
   // TODO(creis): should this apply to applications?
   SiteInstance* instance = NULL;
   // Don't use this logic when "--process-per-tab" is specified.
-  if (!CommandLine().HasSwitch(switches::kProcessPerTab)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab)) {
     if (current_tab) {
       const WebContents* const web_contents = current_tab->AsWebContents();
       if (web_contents) {
         const GURL& current_url = web_contents->GetURL();
         if (SiteInstance::IsSameWebSite(current_url, url))
           instance = web_contents->GetSiteInstance();
       }
     }
   }
 
@@ skipping 895 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }