Allow the default browser check to return "unknown" and reflect that in the UI.

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2006-2009 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 <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 162 matching lines @@
 
 bool ShellIntegration::SetAsDefaultBrowser() {
   std::vector<std::string> argv;
   argv.push_back("xdg-settings");
   argv.push_back("set");
   argv.push_back("default-web-browser");
   argv.push_back(GetDesktopName());
   return LaunchXdgUtility(argv);
 }
 
-bool ShellIntegration::IsDefaultBrowser() {
+ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() {
   std::vector<std::string> argv;
   argv.push_back("xdg-settings");
   argv.push_back("check");
   argv.push_back("default-web-browser");
   argv.push_back(GetDesktopName());
 
   std::string reply;
   if (!base::GetAppOutput(CommandLine(argv), &reply)) {
-    // If xdg-settings fails, we assume that we should pretend we're the default
-    // browser to avoid giving repeated prompts to set ourselves as the default.
-    // TODO(mdm): Really, being the default browser should be a ternary query:
-    // yes, no, and "don't know" so the UI can reflect this more accurately.
-    return true;
+    // xdg-settings failed: we can't determine or set the default browser.
+    return UNKNOWN_DEFAULT_BROWSER;
   }
 
   // Allow any reply that starts with "yes".
-  return reply.find("yes") == 0;
+  return (reply.find("yes") == 0) ? IS_DEFAULT_BROWSER : NOT_DEFAULT_BROWSER;

[Evan Martin, 2009/09/04 22:46:15]

I wonder what happens in non-english locales?  (Not relevant to this change,
just noticed it now.)

[Mike Mammarella, 2009/09/04 22:56:27]

I wrote the other end of this in xdg-settings. It does "echo yes" so no worries.
:)

 }
 
 bool ShellIntegration::IsFirefoxDefaultBrowser() {
   std::vector<std::string> argv;
   argv.push_back("xdg-settings");
   argv.push_back("get");
   argv.push_back("default-web-browser");
 
   std::string browser;
   // We don't care about the return value here.
@@ skipping 52 matching lines @@
     }
   }
   return output_buffer;
 }
 
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info) {
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
       new CreateDesktopShortcutTask(shortcut_info));
 }