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

1 files changed, 15 insertions, 0 deletions

diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 074b6c8..c822ec8 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -18,6 +18,8 @@ namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*, wchar_t*);
 
+typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
+
 // Not generic, we only handle strings up to 128 chars.
 bool ReadRegistryStr(HKEY key, const wchar_t* name, std::wstring* value) {
   BYTE out[128 * sizeof(wchar_t)];
@@ -196,6 +198,19 @@ int MainDllLoader::Launch(HINSTANCE instance,
   return OnBeforeExit(rc);
 }
 
+void MainDllLoader::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
+  RelaunchChromeBrowserWithNewCommandLineIfNeededFunc relaunch_function =
+      reinterpret_cast<RelaunchChromeBrowserWithNewCommandLineIfNeededFunc>(
+          ::GetProcAddress(dll_,
+                           "RelaunchChromeBrowserWithNewCommandLineIfNeeded"));
+  if (!relaunch_function) {
+    LOG(ERROR) << "Could not find exported function "
+               << "RelaunchChromeBrowserWithNewCommandLineIfNeeded";
+  } else {
+    relaunch_function();
+  }
+}
+
 //=============================================================================
 
 class ChromeDllLoader : public MainDllLoader {