diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 12:47:28 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 12:47:28 +0000 |
| commit | 59c27017088f1cfb85e6a35f2f3ff762bd898864 (patch) | |
| tree | 917ccfedd7b307c2a922039fa86a00286bffc128 /chrome/browser/cocoa | |
| parent | d38f0991f8a25a28d86a96152158059578e82017 (diff) | |
| download | chromium_src-59c27017088f1cfb85e6a35f2f3ff762bd898864.zip chromium_src-59c27017088f1cfb85e6a35f2f3ff762bd898864.tar.gz chromium_src-59c27017088f1cfb85e6a35f2f3ff762bd898864.tar.bz2 | |
Fix for crash in empty home page field. Ensure pref gets set back to NTP. BUG=11852.
Review URL: http://codereview.chromium.org/113363
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 49dc364..c4eb172 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -27,7 +27,8 @@ NSString* const kUserDoneEditingPrefsNotification = namespace { std::wstring GetNewTabUIURLString() { - return UTF8ToWide(chrome::kChromeUINewTabURL); + std::wstring temp = UTF8ToWide(chrome::kChromeUINewTabURL); + return URLFixerUpper::FixupURL(temp, std::wstring()); } } // namespace @@ -313,6 +314,8 @@ enum { kHomepageNewTabPage, kHomepageURL }; // If the text field contains a valid URL, sync it to prefs. We run it // through the fixer upper to allow input like "google.com" to be converted // to something valid ("http://google.com"). + if (!urlString) + urlString = [NSString stringWithFormat:@"%s", chrome::kChromeUINewTabURL]; std::wstring temp = base::SysNSStringToWide(urlString); std::wstring fixedString = URLFixerUpper::FixupURL(temp, std::wstring()); if (GURL(WideToUTF8(fixedString)).is_valid()) |