Two small changes so I can reuse the MainDllLoader

For loading the metro_driver, now that is going to be in the
version directory.

BUG=118641
TEST=chrome starts.
Review URL: https://chromiumcodereview.appspot.com/9956031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130196 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 5 deletions

diff --git a/chrome/app/client_util.h b/chrome/app/client_util.h
index e02b37a..7b12d8b 100644
--- a/chrome/app/client_util.h
+++ b/chrome/app/client_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,6 +16,9 @@ namespace sandbox {
   struct SandboxInterfaceInfo;
 }
 
+// Gets the path of the current exe with a trailing backslash.
+std::wstring GetExecutablePath();
+
 // Implements the common aspects of loading chrome.dll for both chrome and
 // chromium scenarios, which are in charge of implementing two abstract
 // methods: GetRegistryPath() and OnBeforeLaunch().
@@ -31,14 +34,13 @@ class MainDllLoader {
   // upon termination.
   int Launch(HINSTANCE instance, sandbox::SandboxInterfaceInfo* sbox_info);
 
+  // Look into the registry to find the latest version.
+  std::wstring GetVersion();
+
   // Launches a new instance of the browser if the current instance in
   // persistent mode an upgrade is detected.
   void RelaunchChromeBrowserWithNewCommandLineIfNeeded();
 
-  // Derived classes must return the relative registry path that holds the
-  // most current version of chrome.dll.
-  virtual std::wstring GetRegistryPath() = 0;
-
   // Called after chrome.dll has been loaded but before the entry point
   // is invoked. Derived classes can implement custom actions here.
   // |dll_path| refers to the path of the Chrome dll being loaded.
@@ -52,6 +54,10 @@ class MainDllLoader {
   }
 
  protected:
+  // Derived classes must return the relative registry path that holds the
+  // most current version of chrome.dll.
+  virtual std::wstring GetRegistryPath() = 0;
+
   HMODULE Load(std::wstring* out_version, std::wstring* out_file);
 
  private: