diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-07 02:57:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-07 02:57:59 +0000 |
| commit | 3ba7e0887015ba6a59579c4de08a6d609f851c23 (patch) | |
| tree | d4b3ab95c9fa344346e2a1d3357916771587dcd1 /chrome/browser/shell_integration_linux.cc | |
| parent | 3eac24a2b4c9438196899e62ac2f3ae5f03ba039 (diff) | |
| download | chromium_src-3ba7e0887015ba6a59579c4de08a6d609f851c23.zip chromium_src-3ba7e0887015ba6a59579c4de08a6d609f851c23.tar.gz chromium_src-3ba7e0887015ba6a59579c4de08a6d609f851c23.tar.bz2 | |
base: rename Environment::GetEnv to Environment::GetVar.
This is the part 4 and the latest of this series.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3029062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_linux.cc')
| -rw-r--r-- | chrome/browser/shell_integration_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 27b5a9b..7c0d4cc 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -49,7 +49,7 @@ std::string GetDesktopName(base::Environment* env) { // versions can set themselves as the default without interfering with // non-official, packaged versions using the built-in value. std::string name; - if (env->GetEnv("CHROME_DESKTOP", &name) && !name.empty()) + if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty()) return name; return "chromium-browser.desktop"; #endif @@ -254,13 +254,13 @@ bool ShellIntegration::GetDesktopShortcutTemplate( std::vector<FilePath> search_paths; std::string xdg_data_home; - if (env->GetEnv("XDG_DATA_HOME", &xdg_data_home) && + if (env->GetVar("XDG_DATA_HOME", &xdg_data_home) && !xdg_data_home.empty()) { search_paths.push_back(FilePath(xdg_data_home)); } std::string xdg_data_dirs; - if (env->GetEnv("XDG_DATA_DIRS", &xdg_data_dirs) && + if (env->GetVar("XDG_DATA_DIRS", &xdg_data_dirs) && !xdg_data_dirs.empty()) { StringTokenizer tokenizer(xdg_data_dirs, ":"); while (tokenizer.GetNext()) { |