summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 21:27:30 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 21:27:30 +0000
commit4b77bf1d8d5023c6a9232ce41f24d5bfbb3aaff6 (patch)
treea0e17b93d9e59b3f9abe86b00154d7abbe0888d2 /chrome/common
parentba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df (diff)
downloadchromium_src-4b77bf1d8d5023c6a9232ce41f24d5bfbb3aaff6.zip
chromium_src-4b77bf1d8d5023c6a9232ce41f24d5bfbb3aaff6.tar.gz
chromium_src-4b77bf1d8d5023c6a9232ce41f24d5bfbb3aaff6.tar.bz2
Use real creator code for Keychain items. Instead of hard-coding 'rimZ', use
the correct creator code for the application. This is 'rimZ' for branded Google Chrome, and 'Cr24' for Chromium. BUG=19000 TEST=No functional change in Google Chrome-branded builds Review URL: http://codereview.chromium.org/164332 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index e8f26b6..2460f49 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -8,7 +8,6 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/mac_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/sys_info.h"
@@ -16,6 +15,10 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
+#if defined(OS_MACOSX)
+#include "base/mac_util.h"
+#endif
+
namespace chrome {
bool GetGearsPluginPathFromCommandLine(FilePath* path) {