Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Side by Side Diff: content/plugin/plugin_main_mac.mm

Issue 8771028: [Mac] Remove content/ CrApplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk for commit-queue. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/renderer/renderer_main_platform_delegate_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #import <AppKit/AppKit.h>
6
5 #include "base/environment.h" 7 #include "base/environment.h"
6 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
7 #include "base/string_util.h" 9 #include "base/string_util.h"
8 #include "content/common/chrome_application_mac.h"
9 #include "content/common/plugin_carbon_interpose_constants_mac.h" 10 #include "content/common/plugin_carbon_interpose_constants_mac.h"
10 #include "content/plugin/plugin_interpose_util_mac.h" 11 #include "content/plugin/plugin_interpose_util_mac.h"
11 12
12 #if !defined(__LP64__) 13 #if !defined(__LP64__)
13 void TrimInterposeEnvironment() { 14 void TrimInterposeEnvironment() {
14 scoped_ptr<base::Environment> env(base::Environment::Create()); 15 scoped_ptr<base::Environment> env(base::Environment::Create());
15 16
16 std::string interpose_list; 17 std::string interpose_list;
17 if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, 18 if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
18 &interpose_list)) { 19 &interpose_list)) {
(...skipping 18 matching lines...) Expand all
37 std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1); 38 std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1);
38 env->SetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey, 39 env->SetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
39 trimmed_list.c_str()); 40 trimmed_list.c_str());
40 } else { 41 } else {
41 NOTREACHED() << "Missing Carbon interposing library"; 42 NOTREACHED() << "Missing Carbon interposing library";
42 } 43 }
43 } 44 }
44 #endif 45 #endif
45 46
46 void InitializeChromeApplication() { 47 void InitializeChromeApplication() {
47 [CrApplication sharedApplication]; 48 [NSApplication sharedApplication];
48
49 mac_plugin_interposing::SetUpCocoaInterposing(); 49 mac_plugin_interposing::SetUpCocoaInterposing();
50 } 50 }
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/renderer/renderer_main_platform_delegate_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698