| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/app/chrome_main_mac.h" | 5 #include "chrome/app/chrome_main_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | |
| 12 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
| 13 #include "base/logging.h" | 12 #include "base/logging.h" |
| 14 #import "base/mac/bundle_locations.h" | 13 #import "base/mac/bundle_locations.h" |
| 15 #import "base/mac/foundation_util.h" | 14 #import "base/mac/foundation_util.h" |
| 16 #import "base/mac/scoped_nsautorelease_pool.h" | 15 #import "base/mac/scoped_nsautorelease_pool.h" |
| 17 #include "base/strings/sys_string_conversions.h" | 16 #include "base/strings/sys_string_conversions.h" |
| 18 #include "chrome/common/chrome_paths_internal.h" | 17 #include "chrome/common/chrome_paths_internal.h" |
| 19 | 18 |
| 20 void SetUpBundleOverrides() { | 19 void SetUpBundleOverrides() { |
| 21 base::mac::ScopedNSAutoreleasePool pool; | 20 base::mac::ScopedNSAutoreleasePool pool; |
| 22 | 21 |
| 23 base::mac::SetOverrideFrameworkBundlePath(chrome::GetFrameworkBundlePath()); | 22 base::mac::SetOverrideFrameworkBundlePath(chrome::GetFrameworkBundlePath()); |
| 24 | 23 |
| 25 NSBundle* base_bundle = chrome::OuterAppBundle(); | 24 NSBundle* base_bundle = chrome::OuterAppBundle(); |
| 26 base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]); | 25 base::mac::SetBaseBundleID([[base_bundle bundleIdentifier] UTF8String]); |
| 27 } | 26 } |
| OLD | NEW |