summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
authortwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 21:24:59 +0000
committertwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-12 21:24:59 +0000
commitb283a75393c7c54e33ca7d25f9eec55ac6a2960b (patch)
treef18455820a1e47b5da8602f7ebc0a99296866e11 /chrome/browser/importer
parent8e07d29abff1de820b4ca5105534f3bcc6a0510d (diff)
downloadchromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.zip
chromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.tar.gz
chromium_src-b283a75393c7c54e33ca7d25f9eec55ac6a2960b.tar.bz2
Clone of issue 2941001. See initial review below.
http://codereview.chromium.org/2941001 Initial submit broke the chromeos build. This patch includes the original change, and fixes to compile ChromeOs properly. BUG=None TEST=None Review URL: http://codereview.chromium.org/2819086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/importer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 1f8f13f..4217a80 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -203,7 +203,8 @@ void ImporterHost::StartImportSettings(
SiteInstance* site = instance->GetSiteInstanceForURL(url);
Browser* browser = BrowserList::GetLastActive();
browser->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
- TabStripModel::ADD_SELECTED, site, std::string());
+ TabStripModel::ADD_SELECTED, site, std::string(),
+ NULL);
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &ImporterHost::OnLockViewEnd, false));