diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-21 19:52:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-21 19:52:47 +0000 |
| commit | 91355a856f83888eab29f6a3299aa7c0fe69c3e3 (patch) | |
| tree | 99ecc647ffb3988279cc768a5a00b7d5a32125ce /content/plugin/plugin_main_mac.mm | |
| parent | 8463d75aed2831944bfc7471ef239b0c6e31a6ca (diff) | |
| download | chromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.zip chromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.tar.gz chromium_src-91355a856f83888eab29f6a3299aa7c0fe69c3e3.tar.bz2 | |
Move content's a plugin, ppapi_plugin, utility, and worker subdirectories to the content namespace.
Review URL: https://codereview.chromium.org/11231016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/plugin_main_mac.mm')
| -rw-r--r-- | content/plugin/plugin_main_mac.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/plugin/plugin_main_mac.mm b/content/plugin/plugin_main_mac.mm index 7bdbb42..c8dddfd 100644 --- a/content/plugin/plugin_main_mac.mm +++ b/content/plugin/plugin_main_mac.mm @@ -11,6 +11,8 @@ #include "content/plugin/plugin_interpose_util_mac.h" #include "content/public/common/content_client.h" +namespace content { + #if !defined(__LP64__) void TrimInterposeEnvironment() { scoped_ptr<base::Environment> env(base::Environment::Create()); @@ -28,7 +30,7 @@ void TrimInterposeEnvironment() { // 1) The whole string is "<kInterposeLibraryPath>", so just clear it, or // 2) ":<kInterposeLibraryPath>" is the end of the string, so trim and re-set. std::string interpose_library_path = - content::GetContentClient()->GetCarbonInterposePath(); + GetContentClient()->GetCarbonInterposePath(); DCHECK_GE(interpose_list.size(), interpose_library_path.size()); size_t suffix_offset = interpose_list.size() - interpose_library_path.size(); if (suffix_offset == 0 && @@ -49,3 +51,5 @@ void InitializeChromeApplication() { [NSApplication sharedApplication]; mac_plugin_interposing::SetUpCocoaInterposing(); } + +} // namespace content |