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

chrome/browser/gtk/create_application_shortcuts_dialog_gtk.cc

-// Copyright (c) 2009 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.
 
 #include "chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h"
 
+#include <string>
+
 #include "app/l10n_util.h"
-#include "base/linux_util.h"
+#include "base/env_var.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 // static
@@ skipping 98 matching lines @@
 
 void CreateApplicationShortcutsDialogGtk::OnErrorDialogResponse(
     GtkWidget* widget, int response) {
   Release();
 }
 
 void CreateApplicationShortcutsDialogGtk::CreateDesktopShortcut(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 
-  scoped_ptr<base::EnvironmentVariableGetter> env_getter(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
   std::string shortcut_template;
   if (ShellIntegration::GetDesktopShortcutTemplate(env_getter.get(),
                                                    &shortcut_template)) {
     ShellIntegration::CreateDesktopShortcut(shortcut_info,
                                             shortcut_template);
     Release();
   } else {
     ChromeThread::PostTask(ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(this,
@@ skipping 32 matching lines @@
           IDS_CREATE_SHORTCUTS_ERROR_LABEL,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(description), TRUE);
   gtk_misc_set_alignment(GTK_MISC(description), 0, 0);
   gtk_box_pack_start(GTK_BOX(vbox), description, FALSE, FALSE, 0);
 
   g_signal_connect(error_dialog_, "response",
                    G_CALLBACK(HandleOnResponseErrorDialog), this);
   gtk_widget_show_all(error_dialog_);
 }