diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 20:04:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 20:04:06 +0000 |
| commit | 88c50ab803907cb0ea0c7acc14f94dbb267d473f (patch) | |
| tree | dde8db67ef4e94abc64f700adc38cfdc1a88a9d6 /base | |
| parent | 5a9b083b725c8f9b40ad53ad6cc0f97e8f6d211b (diff) | |
| download | chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.zip chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.gz chromium_src-88c50ab803907cb0ea0c7acc14f94dbb267d473f.tar.bz2 | |
GTK: Turn on the GTK+ integration by default.
This will regress default startup time for users by 50ms. This doesn't matter
because this is what the users want--I've lost count of the number bloggers,
people on twitter, and people in our IRC channel complaining about the lack of
GTK+ integration...when it's just not on by default.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1442001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/linux_util.cc | 4 | ||||
| -rw-r--r-- | base/linux_util.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/base/linux_util.cc b/base/linux_util.cc index 14c355e..e49a01f 100644 --- a/base/linux_util.cc +++ b/base/linux_util.cc @@ -274,6 +274,8 @@ DesktopEnvironment GetDesktopEnvironment(EnvironmentVariableGetter* env) { return DESKTOP_ENVIRONMENT_KDE4; return DESKTOP_ENVIRONMENT_KDE3; } + else if (desktop_session == "xfce4") + return DESKTOP_ENVIRONMENT_XFCE; } // Fall back on some older environment variables. @@ -300,6 +302,8 @@ const char* GetDesktopEnvironmentName(DesktopEnvironment env) { return "KDE3"; case DESKTOP_ENVIRONMENT_KDE4: return "KDE4"; + case DESKTOP_ENVIRONMENT_XFCE: + return "XFCE"; } return NULL; } diff --git a/base/linux_util.h b/base/linux_util.h index b62f7cc..2139746 100644 --- a/base/linux_util.h +++ b/base/linux_util.h @@ -61,6 +61,7 @@ enum DesktopEnvironment { // them as two different desktop environments here. DESKTOP_ENVIRONMENT_KDE3, DESKTOP_ENVIRONMENT_KDE4, + DESKTOP_ENVIRONMENT_XFCE, }; // Return an entry from the DesktopEnvironment enum with a best guess |