diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:50 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:50 +0000 |
| commit | b02d038b93c3bba2ea0817cee9eb2385ade1d97a (patch) | |
| tree | c3c097f4b6058f105d3bfbd7da00598cb0140251 /chrome/browser/browser_init.cc | |
| parent | a136016faff78780a4776c03e252e51d2f7cae37 (diff) | |
| download | chromium_src-b02d038b93c3bba2ea0817cee9eb2385ade1d97a.zip chromium_src-b02d038b93c3bba2ea0817cee9eb2385ade1d97a.tar.gz chromium_src-b02d038b93c3bba2ea0817cee9eb2385ade1d97a.tar.bz2 | |
Step 1 in getting rid of transient prefs. Move over --homepage to
not using a transient pref.
BUG=28992
Review URL: http://codereview.chromium.org/457003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index ba3bc11..9134f05 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -237,20 +237,6 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate { DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate); }; -void SetOverrideHomePage(const CommandLine& command_line, - PrefService* prefs) { - // If homepage is specified on the command line, canonify & store it. - if (command_line.HasSwitch(switches::kHomePage)) { - FilePath browser_directory; - PathService::Get(base::DIR_CURRENT, &browser_directory); - std::wstring new_homepage = URLFixerUpper::FixupRelativeFile( - browser_directory.ToWStringHack(), - command_line.GetSwitchValue(switches::kHomePage)); - prefs->transient()->SetString(prefs::kHomePage, new_homepage); - prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false); - } -} - SessionStartupPref GetSessionStartupPref(const CommandLine& command_line, Profile* profile) { SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile); @@ -816,9 +802,6 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line, } } - // Allow the command line to override the persisted setting of home page. - SetOverrideHomePage(command_line, profile->GetPrefs()); - bool silent_launch = false; if (command_line.HasSwitch(switches::kAutomationClientChannelID)) { std::string automation_channel_id = command_line.GetSwitchValueASCII( |