Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe...

chrome/browser/shell_integration.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_BROWSER_SHELL_INTEGRATION_H__
-#define CHROME_BROWSER_SHELL_INTEGRATION_H__
+#ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
+#define CHROME_BROWSER_SHELL_INTEGRATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class FilePath;
 
+#if defined(USE_X11)
 namespace base {
-class EnvironmentVariableGetter;
+class EnvVarGetter;
 }
+#endif
 
 class ShellIntegration {
  public:
   // Sets Chrome as default browser (only for current user). Returns false if
   // this operation fails.
   static bool SetAsDefaultBrowser();
 
   // On Linux, it may not be possible to determine or set the default browser
   // on some desktop environments or configurations. So, we use this enum and
   // not a plain bool. (Note however that if used like a bool, this enum will
@@ skipping 35 matching lines @@
   };
 
   // Re-implementation of chrome_plugin_utill::CPB_GetCommandLineArgumentsCommon
   // which is deprecated. If |extension_app_id| is non-empty, an arguments
   // string is created using the kAppId=<id> flag. Otherwise, the kApp=<url> is
   // used.
   static std::string GetCommandLineArgumentsCommon(const GURL& url,
       const string16& extension_app_id);
 
 #if defined(USE_X11)
-  static bool GetDesktopShortcutTemplate(
-      base::EnvironmentVariableGetter* env_getter, std::string* output);
+  static bool GetDesktopShortcutTemplate(base::EnvVarGetter* env_getter,
+                                         std::string* output);
 
   // Returns filename for .desktop file based on |url|, sanitized for security.
   static FilePath GetDesktopShortcutFilename(const GURL& url);
 
   // Returns contents for .desktop file based on |template_contents|, |url|
   // and |title|. The |template_contents| should be contents of .desktop file
   // used to launch Chrome.
   static std::string GetDesktopFileContents(
       const std::string& template_contents, const GURL& url,
       const string16& extension_id, const string16& title,
@@ skipping 74 matching lines @@
     // Updates the UI in our associated view with the current default browser
     // state.
     void UpdateUI(DefaultBrowserState state);
 
     DefaultBrowserObserver* observer_;
 
     DISALLOW_COPY_AND_ASSIGN(DefaultBrowserWorker);
   };
 };
 
-#endif  // CHROME_BROWSER_SHELL_INTEGRATION_H__
+#endif  // CHROME_BROWSER_SHELL_INTEGRATION_H_