diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 19:37:48 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 19:37:48 +0000 |
| commit | 56f9697e2e4a4c79187f3a87f65988db51aa9528 (patch) | |
| tree | 05206a82b08ad0368fc9d08548267c7c076c8fc4 | |
| parent | 67154cc6f7a3cabcf3557aa2d05beffe183ae3aa (diff) | |
| download | chromium_src-56f9697e2e4a4c79187f3a87f65988db51aa9528.zip chromium_src-56f9697e2e4a4c79187f3a87f65988db51aa9528.tar.gz chromium_src-56f9697e2e4a4c79187f3a87f65988db51aa9528.tar.bz2 | |
Fix ShellIntegrationTest.GetDesktopFileContents.
(The test failure is harmless, but annoying.)
BUG=20587
TEST=unit tests pass
TBR=isherman@
TBR=
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80674 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/shell_integration_linux.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/web_applications/web_app.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/web_applications/web_app.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 8c983da..4bb6504 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -426,7 +426,7 @@ std::string ShellIntegration::GetDesktopFileContents( } } -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) std::string wmclass = web_app::GetWMClassFromAppName(app_name); if (!wmclass.empty()) { output_buffer += StringPrintf("StartupWMClass=%s\n", wmclass.c_str()); diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 90e4071..37bd0fe 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -521,7 +521,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, } #endif -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) std::string GetWMClassFromAppName(std::string app_name) { file_util::ReplaceIllegalCharactersInPath(&app_name, '_'); TrimString(app_name, "_", &app_name); diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index a0727e9..350a13b 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h @@ -58,7 +58,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif -#if defined(TOOLKIT_GTK) +#if defined(TOOLKIT_USES_GTK) // GTK+ windows that correspond to web apps need to have a deterministic (and // different) WMClass than normal chrome windows so the window manager groups // them as a separate application. |