| Index: chrome/browser/gtk/gconf_titlebar_listener.cc
|
| diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
|
| index 109ed996db25defd8ddb9ed752f5cc35c1d059b5..b33ab17d74a181675f25b83a2f7ed5a8ce709a8c 100644
|
| --- a/chrome/browser/gtk/gconf_titlebar_listener.cc
|
| +++ b/chrome/browser/gtk/gconf_titlebar_listener.cc
|
| @@ -7,7 +7,7 @@
|
| #include <gtk/gtk.h>
|
|
|
| #include "base/scoped_ptr.h"
|
| -#include "base/env_var.h"
|
| +#include "base/environment.h"
|
| #include "base/xdg_util.h"
|
| #include "chrome/browser/gtk/browser_titlebar.h"
|
|
|
| @@ -45,8 +45,8 @@ void GConfTitlebarListener::RemoveObserver(BrowserTitlebar* titlebar) {
|
| // Private:
|
|
|
| GConfTitlebarListener::GConfTitlebarListener() : client_(NULL) {
|
| - scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
|
| - if (base::GetDesktopEnvironment(env_getter.get()) ==
|
| + scoped_ptr<base::Environment> env(base::Environment::Create());
|
| + if (base::GetDesktopEnvironment(env.get()) ==
|
| base::DESKTOP_ENVIRONMENT_GNOME) {
|
| client_ = gconf_client_get_default();
|
| // If we fail to get a context, that's OK, since we'll just fallback on
|
|
|