Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6572)

Unified Diff: chrome/browser/first_run/upgrade_util.h

Issue 7215040: Fix relaunches on the Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/first_run/upgrade_util.h
===================================================================
--- chrome/browser/first_run/upgrade_util.h (revision 90369)
+++ chrome/browser/first_run/upgrade_util.h (working copy)
@@ -6,20 +6,26 @@
#define CHROME_BROWSER_FIRST_RUN_UPGRADE_UTIL_H_
#pragma once
+#include "build/build_config.h"
+
+#if !defined(OS_CHROMEOS)
+
class CommandLine;
namespace upgrade_util {
+// Launches Chrome again simulating a "user" launch. If Chrome could not be
+// launched, returns false.
+bool RelaunchChromeBrowser(const CommandLine& command_line);
+
+#if !defined(OS_MACOSX)
+
void SetNewCommandLine(CommandLine* new_command_line);
// Launches a new instance of the browser if the current instance in persistent
// mode an upgrade is detected.
void RelaunchChromeBrowserWithNewCommandLineIfNeeded();
-// Launches chrome again simulating a 'user' launch. If chrome could not be
-// launched the return is false.
-bool RelaunchChromeBrowser(const CommandLine& command_line);
-
// Windows:
// Checks if chrome_new.exe is present in the current instance's install.
// Linux:
@@ -27,6 +33,10 @@
// running instance.
bool IsUpdatePendingRestart();
+#endif // !defined(OS_MACOSX)
+
} // namespace upgrade_util
+#endif // !defined(OS_CHROMEOS)
+
#endif // CHROME_BROWSER_FIRST_RUN_UPGRADE_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698