summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main_mac.mm
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 22:01:51 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 22:01:51 +0000
commitb1cb7b669e706bbd34bc03661a77f241a37e3e84 (patch)
treecb9ad20bbce78eb6d51f4759650697efe45b565c /chrome/app/chrome_main_mac.mm
parent34f4089a8eb2f83033a26e8a959b4a6899f39085 (diff)
downloadchromium_src-b1cb7b669e706bbd34bc03661a77f241a37e3e84.zip
chromium_src-b1cb7b669e706bbd34bc03661a77f241a37e3e84.tar.gz
chromium_src-b1cb7b669e706bbd34bc03661a77f241a37e3e84.tar.bz2
Get rid of unnecessary chrome_main_ files now that most of the code has been removed from them. I just kept the Mac one since we need a file that can include objective c files.
Review URL: http://codereview.chromium.org/7779018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_mac.mm')
-rw-r--r--chrome/app/chrome_main_mac.mm6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/app/chrome_main_mac.mm b/chrome/app/chrome_main_mac.mm
index 35c0017..a09f9d6 100644
--- a/chrome/app/chrome_main_mac.mm
+++ b/chrome/app/chrome_main_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/app/chrome_main.h"
+#include "chrome/app/chrome_main_mac.h"
#import <Cocoa/Cocoa.h>
@@ -18,8 +18,6 @@
#include "chrome/common/chrome_paths_internal.h"
#include "policy/policy_constants.h"
-namespace chrome_main {
-
void CheckUserDataDirPolicy(FilePath* user_data_dir) {
base::mac::ScopedNSAutoreleasePool pool;
@@ -45,5 +43,3 @@ void SetUpBundleOverrides() {
NSBundle* base_bundle = chrome::OuterAppBundle();
base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]);
}
-
-} // namespace chrome_main