Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1085)

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

Issue 6759076: Add the calculated WMClass to generated .desktop files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests on linux Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 0bb8c8cf6d14f40864bf12ca46c33eff11f00083..bfa7a62c739f82f9f7bf11f9849c0be0b967f51f 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -71,6 +71,7 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/bug_report_ui.h"
#include "chrome/browser/ui/window_sizer.h"
+#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
@@ -294,12 +295,12 @@ void BrowserWindowGtk::Init() {
g_object_unref(gtk_window_get_group(window_));
if (browser_->type() & Browser::TYPE_APP) {
- std::string wmclassname = browser_->app_name();
- if (wmclassname != DevToolsWindow::kDevToolsApp) {
- file_util::ReplaceIllegalCharactersInPath(&wmclassname, '_');
- TrimString(wmclassname, "_", &wmclassname);
- gtk_window_set_wmclass(window_, wmclassname.c_str(),
- wmclassname.c_str());
+ std::string app_name = browser_->app_name();
+ if (app_name != DevToolsWindow::kDevToolsApp) {
+ std::string wmclassname = web_app::GetWMClassFromAppName(app_name);
+ gtk_window_set_wmclass(window_,
+ wmclassname.c_str(),
+ gdk_get_program_class());
Marco Trevisan (Treviño) 2011/04/21 15:53:42 This is wrong: you must set the wmclassname as thi
}
}

Powered by Google App Engine
This is Rietveld 408576698