| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/plugin_process_host.h" | 5 #include "content/browser/plugin_process_host.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) && !defined(USE_AURA) | 7 #if defined(OS_WIN) && !defined(USE_AURA) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #elif defined(OS_POSIX) | 9 #elif defined(OS_POSIX) |
| 10 #include <utility> // for pair<> | 10 #include <utility> // for pair<> |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 content::GetContentClient()->browser()->GetApplicationLocale(); | 247 content::GetContentClient()->browser()->GetApplicationLocale(); |
| 248 if (!locale.empty()) { | 248 if (!locale.empty()) { |
| 249 // Pass on the locale so the null plugin will use the right language in the | 249 // Pass on the locale so the null plugin will use the right language in the |
| 250 // prompt to install the desired plugin. | 250 // prompt to install the desired plugin. |
| 251 cmd_line->AppendSwitchASCII(switches::kLang, locale); | 251 cmd_line->AppendSwitchASCII(switches::kLang, locale); |
| 252 } | 252 } |
| 253 | 253 |
| 254 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); | 254 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); |
| 255 | 255 |
| 256 #if defined(OS_POSIX) | 256 #if defined(OS_POSIX) |
| 257 base::environment_vector env; | 257 base::EnvironmentVector env; |
| 258 #if defined(OS_MACOSX) && !defined(__LP64__) | 258 #if defined(OS_MACOSX) && !defined(__LP64__) |
| 259 // Add our interposing library for Carbon. This is stripped back out in | 259 // Add our interposing library for Carbon. This is stripped back out in |
| 260 // plugin_main.cc, so changes here should be reflected there. | 260 // plugin_main.cc, so changes here should be reflected there. |
| 261 std::string interpose_list(plugin_interpose_strings::kInterposeLibraryPath); | 261 std::string interpose_list(plugin_interpose_strings::kInterposeLibraryPath); |
| 262 const char* existing_list = | 262 const char* existing_list = |
| 263 getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey); | 263 getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey); |
| 264 if (existing_list) { | 264 if (existing_list) { |
| 265 interpose_list.insert(0, ":"); | 265 interpose_list.insert(0, ":"); |
| 266 interpose_list.insert(0, existing_list); | 266 interpose_list.insert(0, existing_list); |
| 267 } | 267 } |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 } | 435 } |
| 436 | 436 |
| 437 void PluginProcessHost::OnChannelCreated( | 437 void PluginProcessHost::OnChannelCreated( |
| 438 const IPC::ChannelHandle& channel_handle) { | 438 const IPC::ChannelHandle& channel_handle) { |
| 439 Client* client = sent_requests_.front(); | 439 Client* client = sent_requests_.front(); |
| 440 | 440 |
| 441 if (client) | 441 if (client) |
| 442 client->OnChannelOpened(channel_handle); | 442 client->OnChannelOpened(channel_handle); |
| 443 sent_requests_.pop_front(); | 443 sent_requests_.pop_front(); |
| 444 } | 444 } |
| OLD | NEW |