Transition to base/mac/bundle_locations.h step 3

chrome/browser/shell_integration_mac.mm

 // 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 "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/foundation_util.h"
 #include "chrome/common/chrome_version_info.h"
 #import "third_party/mozilla/NSWorkspace+Utils.h"
 
 bool ShellIntegration::CanSetAsDefaultBrowser() {
   return chrome::VersionInfo::GetChannel() !=
       chrome::VersionInfo::CHANNEL_CANARY;
 }
 
 // Sets Chromium as default browser to be used by the operating system. This
 // applies only for the current user. Returns false if this cannot be done, or
 // if the operation fails.
 bool ShellIntegration::SetAsDefaultBrowser() {
   if (!CanSetAsDefaultBrowser())
     return false;
 
-  // We really do want the main bundle here, not base::mac::MainAppBundle(),
-  // which is the bundle for the framework.
-  NSString* identifier = [[NSBundle mainBundle] bundleIdentifier];
+  // We really do want the outer bundle here, which always corresponds to the
+  // Chrome bundle.
+  NSString* identifier = [base::mac::OuterBundle() bundleIdentifier];
   if (!identifier)
     return false;
 
   [[NSWorkspace sharedWorkspace] setDefaultBrowserWithIdentifier:identifier];
   return true;
 }
 
 // Sets Chromium as the default application to be used by the operating system
 // for the given protocol. This applies only for the current user. Returns false
 // if this cannot be done, or if the operation fails.
 bool ShellIntegration::SetAsDefaultProtocolClient(const std::string& protocol) {
   if (protocol.empty())
     return false;
 
   if (!CanSetAsDefaultProtocolClient())
     return false;
 
-  // We really do want the main bundle here, not base::mac::MainAppBundle(),
-  // which is the bundle for the framework.
-  NSString* identifier = [[NSBundle mainBundle] bundleIdentifier];
+  NSString* identifier = [base::mac::MainBundle() bundleIdentifier];

[Mark Mentovai, 2012/01/17 16:49:07]

Is it intentional that this file mixes OuterBundle and MainBundle?

[jeremy, 2012/01/19 16:10:27]

Yes this is intentional, do you think the usage is correct?

[Mark Mentovai, 2012/01/19 16:48:54]

jeremy wrote:
It could be, but it’s worth a comment. You should also fix the use of +[NSBundle
mainBundle] in IsDefaultProtocolClient.

   if (!identifier)
     return false;
 
   NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
   OSStatus return_code =
       LSSetDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns),
                                       base::mac::NSToCFCast(identifier));
   return return_code == noErr;
 }
 
@@ skipping 31 matching lines @@
   return result == NSOrderedSame;
 }
 
 }  // namespace
 
 // Attempt to determine if this instance of Chrome is the default browser and
 // return the appropriate state. (Defined as being the handler for HTTP/HTTPS
 // protocols; we don't want to report "no" here if the user has simply chosen
 // to open HTML files in a text editor and FTP links with an FTP client.)
 ShellIntegration::DefaultWebClientState ShellIntegration::IsDefaultBrowser() {
-  // We really do want the main bundle here, not base::mac::MainAppBundle(),
-  // which is the bundle for the framework.
-  NSString* my_identifier = [[NSBundle mainBundle] bundleIdentifier];
+  // We really do want the outer bundle here, which always corresponds to the
+  // Chrome bundle.
+  NSString* my_identifier = [base::mac::OuterBundle() bundleIdentifier];
   if (!my_identifier)
     return UNKNOWN_DEFAULT_WEB_CLIENT;
 
   return IsIdentifierDefaultBrowser(my_identifier) ? IS_DEFAULT_WEB_CLIENT
                                                    : NOT_DEFAULT_WEB_CLIENT;
 }
 
 // Returns true if Firefox is the default browser for the current user.
 bool ShellIntegration::IsFirefoxDefaultBrowser() {
   return IsIdentifierDefaultBrowser(@"org.mozilla.firefox");
 }
 
 // Attempt to determine if this instance of Chrome is the default client
 // application for the given protocol and return the appropriate state.
 ShellIntegration::DefaultWebClientState
     ShellIntegration::IsDefaultProtocolClient(const std::string& protocol) {
   if (protocol.empty())
     return UNKNOWN_DEFAULT_WEB_CLIENT;
 
   // We really do want the main bundle here, not base::mac::MainAppBundle(),
   // which is the bundle for the framework.
   NSString* my_identifier = [[NSBundle mainBundle] bundleIdentifier];
   if (!my_identifier)
     return UNKNOWN_DEFAULT_WEB_CLIENT;
 
   NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
   return IsIdentifierDefaultProtocolClient(my_identifier, protocol_ns) ?
       IS_DEFAULT_WEB_CLIENT : NOT_DEFAULT_WEB_CLIENT;
 }