diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 01:05:39 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 01:05:39 +0000 |
| commit | 9bc8cff2f20eb98d86cfa77f5e75b5b3efc80ced (patch) | |
| tree | 969fefb9d6c5d42d974fccd4d640861dc880a73d /chrome/browser/shell_integration.h | |
| parent | d5c8101d795d43c265d81277305958d38160ab19 (diff) | |
| download | chromium_src-9bc8cff2f20eb98d86cfa77f5e75b5b3efc80ced.zip chromium_src-9bc8cff2f20eb98d86cfa77f5e75b5b3efc80ced.tar.gz chromium_src-9bc8cff2f20eb98d86cfa77f5e75b5b3efc80ced.tar.bz2 | |
Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h and rename it EnvVarGetter. Label base::SysInfo::{Get,Has}EnvVar as deprecated.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1606007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration.h')
| -rw-r--r-- | chrome/browser/shell_integration.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 42adfd6..7465e11 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -1,9 +1,9 @@ -// 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> @@ -15,9 +15,11 @@ class FilePath; +#if defined(USE_X11) namespace base { -class EnvironmentVariableGetter; +class EnvVarGetter; } +#endif class ShellIntegration { public: @@ -73,8 +75,8 @@ class ShellIntegration { 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); @@ -169,4 +171,4 @@ class ShellIntegration { }; }; -#endif // CHROME_BROWSER_SHELL_INTEGRATION_H__ +#endif // CHROME_BROWSER_SHELL_INTEGRATION_H_ |