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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_util.cc

Issue 2195063003: Linux: Sync GetDesktopName in gtk2_util.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gtk2_util.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
index 6aceaf3e6180557664e93f63db715b2f34b6d1d2..fa609372cfb87659172d2f34a8a1dde1183cd163 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
@@ -14,6 +14,8 @@
#include "base/command_line.h"
#include "base/debug/leak_annotations.h"
#include "base/environment.h"
+#include "chrome/common/channel_info.h"
+#include "components/version_info/version_info.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/accelerators/accelerator.h"
@@ -61,7 +63,15 @@ void GtkInitFromCommandLine(const base::CommandLine& command_line) {
// from browser and above.
std::string GetDesktopName(base::Environment* env) {
#if defined(GOOGLE_CHROME_BUILD)
- return "google-chrome.desktop";
+ version_info::Channel product_channel(chrome::GetChannel());
+ switch (product_channel) {
+ case version_info::Channel::DEV:
+ return "google-chrome-unstable.desktop";
+ case version_info::Channel::BETA:
+ return "google-chrome-beta.desktop";
+ default:
+ return "google-chrome.desktop";
+ }
#else // CHROMIUM_BUILD
// Allow $CHROME_DESKTOP to override the built-in value, so that development
// versions can set themselves as the default without interfering with
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698