OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/plugin/webplugin_delegate_stub.h" | 5 #include "chrome/plugin/webplugin_delegate_stub.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/common/child_process_logging.h" | 10 #include "chrome/common/child_process_logging.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
158 page_url_ = params.page_url; | 158 page_url_ = params.page_url; |
159 child_process_logging::SetActiveURL(page_url_); | 159 child_process_logging::SetActiveURL(page_url_); |
160 | 160 |
161 *result = false; | 161 *result = false; |
162 if (params.arg_names.size() != params.arg_values.size()) { | 162 if (params.arg_names.size() != params.arg_values.size()) { |
163 NOTREACHED(); | 163 NOTREACHED(); |
164 return; | 164 return; |
165 } | 165 } |
166 | 166 |
167 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 167 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
168 FilePath path = FilePath::FromWStringHack( | 168 FilePath path = |
169 command_line.GetSwitchValue(switches::kPluginPath)); | 169 command_line.GetSwitchValuePath(switches::kPluginPath) |
170 | 170 ; |
tony
2010/08/06 00:09:38
Nit: semicolon on wrong line?
| |
171 | 171 |
172 gfx::PluginWindowHandle parent = gfx::kNullPluginWindow; | 172 gfx::PluginWindowHandle parent = gfx::kNullPluginWindow; |
173 #if defined(OS_WIN) | 173 #if defined(OS_WIN) |
174 parent = gfx::NativeViewFromId(params.containing_window); | 174 parent = gfx::NativeViewFromId(params.containing_window); |
175 #elif defined(OS_LINUX) | 175 #elif defined(OS_LINUX) |
176 // This code is disabled, See issue 17110. | 176 // This code is disabled, See issue 17110. |
177 // The problem is that the XID can change at arbitrary times (e.g. when the | 177 // The problem is that the XID can change at arbitrary times (e.g. when the |
178 // tab is detached then reattached), so we need to be able to track these | 178 // tab is detached then reattached), so we need to be able to track these |
179 // changes, and let the PluginInstance know. | 179 // changes, and let the PluginInstance know. |
180 // PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId( | 180 // PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId( |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
463 webplugin_->OnResourceCreated(resource_id, resource_client); | 463 webplugin_->OnResourceCreated(resource_id, resource_client); |
464 } | 464 } |
465 | 465 |
466 #if defined(OS_MACOSX) | 466 #if defined(OS_MACOSX) |
467 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( | 467 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( |
468 gfx::PluginWindowHandle window) { | 468 gfx::PluginWindowHandle window) { |
469 delegate_->set_windowed_handle(window); | 469 delegate_->set_windowed_handle(window); |
470 } | 470 } |
471 #endif | 471 #endif |
472 | 472 |
OLD | NEW |