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.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.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 604f122..b9e6cb5 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -6,10 +6,12 @@ #include "app/animation.h" #include "app/l10n_util.h" +#include "base/base_paths.h" #include "base/command_line.h" #include "base/gfx/point.h" #include "base/keyboard_codes.h" #include "base/logging.h" +#include "base/path_service.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/app/chrome_dll_resource.h" @@ -2999,6 +3001,19 @@ void Browser::BuildPopupWindowHelper(TabContents* source, } GURL Browser::GetHomePage() const { + // --homepage overrides any preferences. + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kHomePage)) { + FilePath browser_directory; + PathService::Get(base::DIR_CURRENT, &browser_directory); + std::string new_homepage = URLFixerUpper::FixupRelativeFile( + browser_directory, + command_line.GetSwitchValuePath(switches::kHomePage)); + GURL home_page = GURL(new_homepage); + if (home_page.is_valid()) + return home_page; + } + if (profile_->GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage)) return GURL(chrome::kChromeUINewTabURL); GURL home_page = GURL(URLFixerUpper::FixupURL( |