summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main_mac.mm
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 04:15:13 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 04:15:13 +0000
commit151c4a6e282f4282669fb7360dbcbb59c25b92fa (patch)
treeaced67734d49ef99cbe82508f8f6c544a5dd1b3c /chrome/app/chrome_main_mac.mm
parent55397fc328afa661889e11bfac71617667bd3b69 (diff)
downloadchromium_src-151c4a6e282f4282669fb7360dbcbb59c25b92fa.zip
chromium_src-151c4a6e282f4282669fb7360dbcbb59c25b92fa.tar.gz
chromium_src-151c4a6e282f4282669fb7360dbcbb59c25b92fa.tar.bz2
Use the real Mac browser app's bundle identifier everywhere that a base
bundle identifier is needed on the Mac. This means that everything will use up using org.chromium.Chromium, com.google.Chrome, or com.google.Chrome.canary when it's important to get the base bundle identifier. .helper and .framework will not be appended. Note, however, that things that run inside the helper and use CFPreferences or NSUserDefaults will continue to write their defaults as org.chromium.Chromium.helper or com.google.Chrome.helper. Mostly this just affects the Flash plug-in's settings for the NSNav open dialog. There is no com.google.Chrome.canary.helper, but that's not expected to be a problem. This change ensures that Chromes, canaries, and Chromiums don't get in each other's way. BUG=79814 TEST=none Review URL: http://codereview.chromium.org/6896003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_mac.mm')
-rw-r--r--chrome/app/chrome_main_mac.mm7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/app/chrome_main_mac.mm b/chrome/app/chrome_main_mac.mm
index e27face..b3d19a3 100644
--- a/chrome/app/chrome_main_mac.mm
+++ b/chrome/app/chrome_main_mac.mm
@@ -11,8 +11,10 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/mac/foundation_util.h"
#include "base/sys_string_conversions.h"
#include "chrome/browser/policy/policy_path_parser.h"
+#include "chrome/common/chrome_paths_internal.h"
#include "policy/policy_constants.h"
namespace chrome_main {
@@ -32,4 +34,9 @@ void CheckUserDataDirPolicy(FilePath* user_data_dir) {
}
}
+void SetUpBaseBundleID() {
+ NSBundle* base_bundle = chrome::OuterAppBundle();
+ base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]);
+}
+
} // namespace chrome_main