From 3cdacd4e6a2ca4c305c591dac8176828ae2e2b62 Mon Sep 17 00:00:00 2001 From: "prasadt@chromium.org" Date: Fri, 30 Apr 2010 18:55:53 +0000 Subject: r46025 reverted r46023 which caused a build break on chromeos. This change reverts r46025 and fixes the build break which is just a one line change in chrome/browser/first_run_gtk.cc to move the definition of Upgrade::new_command_line_ to be inside a #if. Details on the change and code review feedback for the original CL can be found at http://codereview.chromium.org/1633021. BUG=40975 TEST=none Review URL: http://codereview.chromium.org/1691022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46103 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/testing_browser_process.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/test') diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h index b95b3a8..e704330 100644 --- a/chrome/test/testing_browser_process.h +++ b/chrome/test/testing_browser_process.h @@ -149,9 +149,9 @@ class TestingBrowserProcess : public BrowserProcess { virtual void CheckForInspectorFiles() {} -#if defined(OS_WIN) +#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) virtual void StartAutoupdateTimer() {} -#endif // OS_WIN +#endif virtual bool have_inspector_files() const { return true; } #if defined(IPC_MESSAGE_LOG_ENABLED) -- cgit v1.1