diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 21:24:59 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 21:24:59 +0000 |
| commit | b283a75393c7c54e33ca7d25f9eec55ac6a2960b (patch) | |
| tree | f18455820a1e47b5da8602f7ebc0a99296866e11 /chrome/browser/browser_init.cc | |
| parent | 8e07d29abff1de820b4ca5105534f3bcc6a0510d (diff) | |
| download | chromium_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/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 4b26d4a..87d7153 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -625,7 +625,7 @@ bool BrowserInit::LaunchWithProfile::OpenApplicationWindow(Profile* profile) { ChildProcessSecurityPolicy::GetInstance(); if (policy->IsWebSafeScheme(url.scheme()) || url.SchemeIs(chrome::kFileScheme)) { - Browser::OpenApplicationWindow(profile, url); + Browser::OpenApplicationWindow(profile, url, NULL); return true; } } @@ -771,7 +771,7 @@ Browser* BrowserInit::LaunchWithProfile::OpenTabsInBrowser( TabContents* tab = browser->AddTabWithURL( tabs[i].url, GURL(), PageTransition::START_PAGE, index, add_types, NULL, - tabs[i].app_id); + tabs[i].app_id, NULL); if (profile_ && first_tab && process_startup) { AddCrashedInfoBarIfNecessary(tab); |