diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 00:15:50 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-21 00:15:50 +0000 |
| commit | bb678330f8aeb30f169129dc32ff8fecef60d58e (patch) | |
| tree | 59784e193346bcf883c664ca0497f3909575e46f /chrome/browser/browser_init.cc | |
| parent | 54dbf3b1b77a3d33f16cc4bf6efc9eec4404d4ef (diff) | |
| download | chromium_src-bb678330f8aeb30f169129dc32ff8fecef60d58e.zip chromium_src-bb678330f8aeb30f169129dc32ff8fecef60d58e.tar.gz chromium_src-bb678330f8aeb30f169129dc32ff8fecef60d58e.tar.bz2 | |
Resurrect toolkit_views build.
Review URL: http://codereview.chromium.org/155797
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index f7595a1..acab527 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -437,7 +437,7 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, browser = BrowserList::GetLastActive(); OpenURLsInBrowser(browser, process_startup, urls_to_open); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) // TODO(port): Remove ifdef when the Linux splash page is not needed. const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); // This can mess up UI tests, so only do it when UI tests aren't running. |