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

Unified Diff: content/plugin/plugin_main_mac.mm

Issue 11235068: Move the remaning files in content\common to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/sandbox_policy.cc ('k') | content/public/browser/browser_child_process_host_iterator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_main_mac.mm
===================================================================
--- content/plugin/plugin_main_mac.mm (revision 163632)
+++ content/plugin/plugin_main_mac.mm (working copy)
@@ -18,8 +18,7 @@
scoped_ptr<base::Environment> env(base::Environment::Create());
std::string interpose_list;
- if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
- &interpose_list)) {
+ if (!env->GetVar(kDYLDInsertLibrariesKey, &interpose_list)) {
LOG(INFO) << "No Carbon Interpose library found.";
return;
}
@@ -35,12 +34,11 @@
size_t suffix_offset = interpose_list.size() - interpose_library_path.size();
if (suffix_offset == 0 &&
interpose_list == interpose_library_path) {
- env->UnSetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey);
+ env->UnSetVar(kDYLDInsertLibrariesKey);
} else if (suffix_offset > 0 && interpose_list[suffix_offset - 1] == ':' &&
interpose_list.substr(suffix_offset) == interpose_library_path) {
std::string trimmed_list = interpose_list.substr(0, suffix_offset - 1);
- env->SetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
- trimmed_list.c_str());
+ env->SetVar(kDYLDInsertLibrariesKey, trimmed_list.c_str());
} else {
NOTREACHED() << "Missing Carbon interposing library";
}
« no previous file with comments | « content/common/sandbox_policy.cc ('k') | content/public/browser/browser_child_process_host_iterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698