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

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

Issue 3052034: base: Rename EnvVarGetter to Environment. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: review Created 10 years, 4 months 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
OLDNEW
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" 5 #include "base/chrome_application_mac.h"
6 #include "base/env_var.h" 6 #include "base/environment.h"
7 #include "base/scoped_ptr.h" 7 #include "base/scoped_ptr.h"
8 #include "base/string_util.h" 8 #include "base/string_util.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::EnvVarGetter> env(base::EnvVarGetter::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->GetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey, 17 if (!env->GetEnv(plugin_interpose_strings::kDYLDInsertLibrariesKey,
18 &interpose_list)) { 18 &interpose_list)) {
19 NOTREACHED() << "No interposing libraries set"; 19 NOTREACHED() << "No interposing libraries set";
20 return; 20 return;
21 } 21 }
22 22
23 // The list is a :-separated list of paths. Because we append our interpose 23 // The list is a :-separated list of paths. Because we append our interpose
24 // library just before forking in plugin_process_host.cc, the only cases we 24 // library just before forking in plugin_process_host.cc, the only cases we
(...skipping 17 matching lines...) Expand all
42 NOTREACHED() << "Missing Carbon interposing library"; 42 NOTREACHED() << "Missing Carbon interposing library";
43 } 43 }
44 } 44 }
45 #endif 45 #endif
46 46
47 void InitializeChromeApplication() { 47 void InitializeChromeApplication() {
48 [CrApplication sharedApplication]; 48 [CrApplication sharedApplication];
49 49
50 mac_plugin_interposing::SetUpCocoaInterposing(); 50 mac_plugin_interposing::SetUpCocoaInterposing();
51 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698