| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/chrome_application_mac.h" | |
| 6 #include "base/environment.h" | 5 #include "base/environment.h" |
| 7 #include "base/scoped_ptr.h" | 6 #include "base/scoped_ptr.h" |
| 8 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "chrome/common/chrome_application_mac.h" |
| 9 #include "chrome/common/plugin_carbon_interpose_constants_mac.h" | 9 #include "chrome/common/plugin_carbon_interpose_constants_mac.h" |
| 10 #include "chrome/plugin/plugin_interpose_util_mac.h" | 10 #include "chrome/plugin/plugin_interpose_util_mac.h" |
| 11 | 11 |
| 12 #if !defined(__LP64__) | 12 #if !defined(__LP64__) |
| 13 void TrimInterposeEnvironment() { | 13 void TrimInterposeEnvironment() { |
| 14 scoped_ptr<base::Environment> env(base::Environment::Create()); | 14 scoped_ptr<base::Environment> env(base::Environment::Create()); |
| 15 | 15 |
| 16 std::string interpose_list; | 16 std::string interpose_list; |
| 17 if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, | 17 if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, |
| 18 &interpose_list)) { | 18 &interpose_list)) { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 41 NOTREACHED() << "Missing Carbon interposing library"; | 41 NOTREACHED() << "Missing Carbon interposing library"; |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 void InitializeChromeApplication() { | 46 void InitializeChromeApplication() { |
| 47 [CrApplication sharedApplication]; | 47 [CrApplication sharedApplication]; |
| 48 | 48 |
| 49 mac_plugin_interposing::SetUpCocoaInterposing(); | 49 mac_plugin_interposing::SetUpCocoaInterposing(); |
| 50 } | 50 } |
| OLD | NEW |