diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 01:23:32 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 01:23:32 +0000 |
commit | 1979689363e58c9917d751d5134287d8616528e5 (patch) | |
tree | 6342d081e86670f1a05b07933888278d6e355759 /chrome/browser/first_run_gtk.cc | |
parent | 27d3571b99a7e69bedb8ac0282b981325906edc2 (diff) | |
download | chromium_src-1979689363e58c9917d751d5134287d8616528e5.zip chromium_src-1979689363e58c9917d751d5134287d8616528e5.tar.gz chromium_src-1979689363e58c9917d751d5134287d8616528e5.tar.bz2 |
Revert r46023: "Detect new instance of the browser when running in the background in persistent"
Broke the build.
Review URL: http://codereview.chromium.org/1718024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run_gtk.cc')
-rw-r--r-- | chrome/browser/first_run_gtk.cc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run_gtk.cc index 0755a7f..a424d60 100644 --- a/chrome/browser/first_run_gtk.cc +++ b/chrome/browser/first_run_gtk.cc @@ -20,8 +20,6 @@ #include "chrome/installer/util/util_constants.h" #include "googleurl/src/gurl.h" -CommandLine* Upgrade::new_command_line_ = NULL; - bool OpenFirstRunDialog(Profile* profile, bool homepage_defined, int import_items, int dont_import_items, @@ -141,47 +139,3 @@ bool FirstRun::ImportBookmarks(const std::wstring& import_bookmarks_path) { // for the process to return. return base::LaunchApp(import_cmd, true, false, NULL); } - -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -double Upgrade::saved_last_modified_time_of_exe_ = 0; - -// static -bool Upgrade::IsUpdatePendingRestart() { - return saved_last_modified_time_of_exe_ != - Upgrade::GetLastModifiedTimeOfExe(); -} - -// static -void Upgrade::SaveLastModifiedTimeOfExe() { - saved_last_modified_time_of_exe_ = Upgrade::GetLastModifiedTimeOfExe(); -} - -// static -void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() { - if (new_command_line_) { - if (!base::LaunchApp(*new_command_line_, false, false, NULL)) { - DLOG(ERROR) << "Launching a new instance of the browser failed."; - } else { - DLOG(WARNING) << "Launched a new instance of the browser."; - } - delete new_command_line_; - new_command_line_ = NULL; - } -} - -// static -double Upgrade::GetLastModifiedTimeOfExe() { - FilePath exe_file_path; - if (!PathService::Get(base::FILE_EXE, &exe_file_path)) { - LOG(WARNING) << "Failed to get FilePath object for FILE_EXE."; - return saved_last_modified_time_of_exe_; - } - file_util::FileInfo exe_file_info; - if (!file_util::GetFileInfo(exe_file_path, &exe_file_info)) { - LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - " - << exe_file_path.value(); - return saved_last_modified_time_of_exe_; - } - return exe_file_info.last_modified.ToDoubleT(); -} -#endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |