Invalid URLs are no longer mangled when reopening the Options window

chrome/browser/views/options/general_page_view.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
 
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/views/url_picker.h"
@@ skipping 86 matching lines @@
   // Enables/Disables the controls associated with the custom start pages
   // option if that preference is not selected.
   void EnableCustomHomepagesControls(bool enable);
 
   // UrlPickerDelegate. Adds the URL to the list of startup urls.
   virtual void AddBookmark(UrlPicker* dialog,
                            const std::wstring& title,
                            const GURL& url);
 
   // Sets the home page preferences for kNewTabPageIsHomePage and kHomePage.
-  // If a blank string is passed in we revert to using NewTab page as the Home
-  // page. When setting the Home Page to NewTab page, we preserve the old value
-  // of kHomePage (we don't overwrite it).
-  void SetHomepage(const std::wstring& homepage);
+  // If an empty or null-host GURL is passed in we revert to using NewTab
+  // page as the Homepage.
+  void SetHomepage(const GURL& homepage);
 
   // Invoked when the selection of the table view changes. Updates the enabled
   // property of the remove button.
   virtual void OnSelectionChanged();
 
   // Enables or disables the field for entering a custom homepage URL.
   void EnableHomepageURLField(bool enabled);
 
   // Sets the default search provider for the selected item in the combobox.
   void SetDefaultSearchProvider();
@@ skipping 30 matching lines @@
   views::Label* default_browser_status_label_;
   views::NativeButton* default_browser_use_as_default_button_;
 
   // The helper object that performs default browser set/check tasks.
   scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
 
   DISALLOW_COPY_AND_ASSIGN(GeneralPageView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_