Chrome frame compile fix, take 2.

tbr=nsylvain

Review URL: http://codereview.chromium.org/274063

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

2 files changed, 49 insertions, 49 deletions

diff --git a/chrome_frame/chrome_launcher.h b/chrome_frame/chrome_launcher.h
index 72b198a..ce4c8ed 100644
--- a/chrome_frame/chrome_launcher.h
+++ b/chrome_frame/chrome_launcher.h
@@ -1,45 +1,45 @@
-// Copyright (c) 2009 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.

-

-#ifndef CHROME_FRAME_CHROME_LAUNCHER_H_

-#define CHROME_FRAME_CHROME_LAUNCHER_H_

-

-#include <string>

-

-class CommandLine;

-

-namespace chrome_launcher {

-

-// The base name of the chrome_launcher.exe file.

-extern const wchar_t kLauncherExeBaseName[];

-

-// Creates a command line suitable for launching Chrome.  You can add any

-// flags needed before launching.

-//

-// The command-line may use the Chrome executable directly, or use an in-between

-// process if needed for security/elevation purposes.  You must delete the

-// returned command line.

-CommandLine* CreateLaunchCommandLine();

-

-// Fills in a new command line from the flags on this process's command line

-// that we are allowing Low Integrity to invoke.

-//

-// Logs a warning for any flags that were passed that are not allowed to be

-// invoked by Low Integrity.

-void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized);

-

-// Given a command-line without an initial program part, launch our associated

-// chrome.exe with a sanitized version of that command line. Returns true iff 

-// successful.

-bool SanitizeAndLaunchChrome(const wchar_t* command_line);

-

-// Returns the full path to the Chrome executable.

-std::wstring GetChromeExecutablePath();

-

-// The type of the CfLaunchChrome entrypoint exported from this DLL.

-typedef int (__stdcall *CfLaunchChromeProc)();

-

-}  // namespace chrome_launcher

-

-#endif  // CHROME_FRAME_CHROME_LAUNCHER_H_

+// Copyright (c) 2009 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.
+
+#ifndef CHROME_FRAME_CHROME_LAUNCHER_H_
+#define CHROME_FRAME_CHROME_LAUNCHER_H_
+
+#include <string>
+
+class CommandLine;
+
+namespace chrome_launcher {
+
+// The base name of the chrome_launcher.exe file.
+extern const wchar_t kLauncherExeBaseName[];
+
+// Creates a command line suitable for launching Chrome.  You can add any
+// flags needed before launching.
+//
+// The command-line may use the Chrome executable directly, or use an in-between
+// process if needed for security/elevation purposes.  You must delete the
+// returned command line.
+CommandLine* CreateLaunchCommandLine();
+
+// Fills in a new command line from the flags on this process's command line
+// that we are allowing Low Integrity to invoke.
+//
+// Logs a warning for any flags that were passed that are not allowed to be
+// invoked by Low Integrity.
+void SanitizeCommandLine(const CommandLine& original, CommandLine* sanitized);
+
+// Given a command-line without an initial program part, launch our associated
+// chrome.exe with a sanitized version of that command line. Returns true iff
+// successful.
+bool SanitizeAndLaunchChrome(const wchar_t* command_line);
+
+// Returns the full path to the Chrome executable.
+FilePath GetChromeExecutablePath();
+
+// The type of the CfLaunchChrome entrypoint exported from this DLL.
+typedef int (__stdcall *CfLaunchChromeProc)();
+
+}  // namespace chrome_launcher
+
+#endif  // CHROME_FRAME_CHROME_LAUNCHER_H_
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 923d957d8..601ef06 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -61,10 +61,10 @@ class ChromeTabModule
     }
 
     if (SUCCEEDED(hr)) {
-      std::wstring app_path(
-          chrome_launcher::GetChromeExecutablePath());
-      app_path = file_util::GetDirectoryFromPath(app_path);
-      hr = registrar->AddReplacement(L"CHROME_APPPATH", app_path.c_str());
+      FilePath app_path =
+          chrome_launcher::GetChromeExecutablePath().DirName();
+      hr = registrar->AddReplacement(L"CHROME_APPPATH",
+                                     app_path.value().c_str());
       DCHECK(SUCCEEDED(hr));
     }