Fix checking default protocol client on Linux

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 206 matching lines @@
   "MimeType",
   "X-Ayatana-Desktop-Shortcuts",
   "StartupWMClass",
   NULL
 };
 
 const char* kDesktopEntry = "Desktop Entry";
 
 const char* kXdgOpenShebang = "#!/usr/bin/env xdg-open";
 
+const char* kXdgSettings = "xdg-settings";
+const char* kXdgSettingsDefaultBrowser = "default-web-browser";
+const char* kXdgSettingsDefaultSchemeHandler = "default-url-scheme-handler";

[Evan Martin, 2011/09/20 14:45:51]

Minor nit: can you make these const char[] instead?

(Difference is that the existing code writes out the array and the pointer as
two variables, while const char[] writes out just the array.)

[benwells, 2011/09/20 23:09:03]

Done.

+
 }  // namespace
 
 // static
 std::string ShellIntegration::GetDesktopName(base::Environment* env) {
 #if defined(GOOGLE_CHROME_BUILD)
   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
   // non-official, packaged versions using the built-in value.
@@ skipping 49 matching lines @@
 // copy.
 
 // If |protocol| is empty this function sets Chrome as the default browser,
 // otherwise it sets Chrome as the default handler application for |protocol|.
 bool SetDefaultWebClient(const std::string& protocol) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   std::vector<std::string> argv;
-  argv.push_back("xdg-settings");
+  argv.push_back(kXdgSettings);
   argv.push_back("set");
   if (protocol.empty()) {
-    argv.push_back("default-web-browser");
+    argv.push_back(kXdgSettingsDefaultBrowser);
   } else {
-    argv.push_back("default-url-scheme-handler");
+    argv.push_back(kXdgSettingsDefaultSchemeHandler);
     argv.push_back(protocol);
   }
   argv.push_back(ShellIntegration::GetDesktopName(env.get()));
 
   int exit_code;
   bool ran_ok = LaunchXdgUtility(argv, &exit_code);
   if (ran_ok && exit_code == EXIT_XDG_SETTINGS_SYNTAX_ERROR) {
-    if (GetChromeVersionOfScript("xdg-settings", &argv[0])) {
+    if (GetChromeVersionOfScript(kXdgSettings, &argv[0])) {
       ran_ok = LaunchXdgUtility(argv, &exit_code);
     }
   }
 
   return ran_ok && exit_code == EXIT_SUCCESS;
 }
 
 // If |protocol| is empty this function checks if Chrome is the default browser,
 // otherwise it checks if Chrome is the default handler application for
 // |protocol|.
 ShellIntegration::DefaultWebClientState GetIsDefaultWebClient(
     const std::string& protocol) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   std::vector<std::string> argv;
-  argv.push_back("xdg-settings");
+  argv.push_back(kXdgSettings);
   argv.push_back("check");
   if (protocol.empty()) {
-    argv.push_back("default-web-browser");
+    argv.push_back(kXdgSettingsDefaultBrowser);
   } else {
-    argv.push_back("default-url-scheme-handler");
+    argv.push_back(kXdgSettingsDefaultSchemeHandler);
     argv.push_back(protocol);
   }
   argv.push_back(ShellIntegration::GetDesktopName(env.get()));
 
   std::string reply;
   int success_code;
   bool ran_ok = base::GetAppOutputWithExitCode(CommandLine(argv), &reply,
                                                &success_code);
   if (ran_ok && success_code == EXIT_XDG_SETTINGS_SYNTAX_ERROR) {
-    if (GetChromeVersionOfScript("xdg_settings", &argv[0])) {
+    if (GetChromeVersionOfScript(kXdgSettings, &argv[0])) {
       ran_ok = base::GetAppOutputWithExitCode(CommandLine(argv), &reply,
                                               &success_code);
     }
   }
 
   if (!ran_ok || success_code != EXIT_SUCCESS) {
     // xdg-settings failed: we can't determine or set the default browser.
     return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
   }
 
@@ skipping 26 matching lines @@
 
 // static
 ShellIntegration::DefaultWebClientState
 ShellIntegration::IsDefaultProtocolClient(const std::string& protocol) {
   return GetIsDefaultWebClient(protocol);
 }
 
 // static
 bool ShellIntegration::IsFirefoxDefaultBrowser() {
   std::vector<std::string> argv;
-  argv.push_back("xdg-settings");
+  argv.push_back(kXdgSettings);
   argv.push_back("get");
-  argv.push_back("default-web-browser");
+  argv.push_back(kXdgSettingsDefaultBrowser);
 
   std::string browser;
   // We don't care about the return value here.
   base::GetAppOutput(CommandLine(argv), &browser);
   return browser.find("irefox") != std::string::npos;
 }
 
 // static
 bool ShellIntegration::GetDesktopShortcutTemplate(
     base::Environment* env, std::string* output) {
@@ skipping 195 matching lines @@
       shortcut_info.extension_id,
       shortcut_info.title,
       icon_name);
 
   if (shortcut_info.create_on_desktop)
     CreateShortcutOnDesktop(shortcut_filename, contents);
 
   if (shortcut_info.create_in_applications_menu)
     CreateShortcutInApplicationsMenu(shortcut_filename, contents);
 }