diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 19:08:57 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 19:08:57 +0000 |
| commit | 4b6b2a59970398c68be566d5df753007e94f05be (patch) | |
| tree | 9a4d9486ef055c5e32710d95a7dcc21a1ee3a20f | |
| parent | 63877e435c810bb0f4f290f9b875b7c79bdeeccc (diff) | |
| download | chromium_src-4b6b2a59970398c68be566d5df753007e94f05be.zip chromium_src-4b6b2a59970398c68be566d5df753007e94f05be.tar.gz chromium_src-4b6b2a59970398c68be566d5df753007e94f05be.tar.bz2 | |
first-run: Remove ifdefs from upgrade_util_linux.cc.
Exclude it from chromeos build when chromeos=1 through gyp rule.
BUG=79203
TEST=None
R=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/6849011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81619 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/first_run/upgrade_util_linux.cc | 4 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc index 9cbf214..6c3fb88 100644 --- a/chrome/browser/first_run/upgrade_util_linux.cc +++ b/chrome/browser/first_run/upgrade_util_linux.cc @@ -15,9 +15,7 @@ namespace { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) double saved_last_modified_time_of_exe = 0; -#endif } // namespace @@ -27,7 +25,6 @@ bool RelaunchChromeBrowser(const CommandLine& command_line) { return base::LaunchApp(command_line, false, false, NULL); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) bool IsUpdatePendingRestart() { return saved_last_modified_time_of_exe != GetLastModifiedTimeOfExe(); } @@ -50,6 +47,5 @@ double GetLastModifiedTimeOfExe() { } return exe_file_info.last_modified.ToDoubleT(); } -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) } // namespace upgrade_util diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 9bd7bb4..c225e09 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3428,6 +3428,7 @@ 'browser/background_mode_manager_linux.cc', 'browser/first_run/upgrade_util.cc', 'browser/first_run/upgrade_util.h', + 'browser/first_run/upgrade_util_linux.cc', 'browser/password_manager/native_backend_gnome_x.cc', 'browser/password_manager/native_backend_gnome_x.h', 'browser/password_manager/native_backend_kwallet_x.cc', |