| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 MSVC_PUSH_WARNING_LEVEL(0); | 10 MSVC_PUSH_WARNING_LEVEL(0); |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 first_geometry_update_(true), | 321 first_geometry_update_(true), |
| 322 mime_type_(mime_type) { | 322 mime_type_(mime_type) { |
| 323 | 323 |
| 324 ArrayToVector(arg_count, arg_names, &arg_names_); | 324 ArrayToVector(arg_count, arg_names, &arg_names_); |
| 325 ArrayToVector(arg_count, arg_values, &arg_values_); | 325 ArrayToVector(arg_count, arg_values, &arg_values_); |
| 326 } | 326 } |
| 327 | 327 |
| 328 WebPluginImpl::~WebPluginImpl() { | 328 WebPluginImpl::~WebPluginImpl() { |
| 329 } | 329 } |
| 330 | 330 |
| 331 void WebPluginImpl::SetWindow(HWND window, HANDLE pump_messages_event) { | 331 void WebPluginImpl::SetWindow(gfx::NativeView window, |
| 332 HANDLE pump_messages_event) { |
| 332 if (window) { | 333 if (window) { |
| 333 DCHECK(!windowless_); // Make sure not called twice. | 334 DCHECK(!windowless_); // Make sure not called twice. |
| 334 window_ = window; | 335 window_ = window; |
| 335 } else { | 336 } else { |
| 336 DCHECK(!window_); // Make sure not called twice. | 337 DCHECK(!window_); // Make sure not called twice. |
| 337 windowless_ = true; | 338 windowless_ = true; |
| 338 } | 339 } |
| 339 } | 340 } |
| 340 | 341 |
| 341 bool WebPluginImpl::CompleteURL(const std::string& url_in, | 342 bool WebPluginImpl::CompleteURL(const std::string& url_in, |
| (...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 client_index = clients_.erase(client_index); | 1400 client_index = clients_.erase(client_index); |
| 1400 if (resource_client) | 1401 if (resource_client) |
| 1401 resource_client->DidFail(); | 1402 resource_client->DidFail(); |
| 1402 } | 1403 } |
| 1403 | 1404 |
| 1404 // This needs to be called now and not in the destructor since the | 1405 // This needs to be called now and not in the destructor since the |
| 1405 // webframe_ might not be valid anymore. | 1406 // webframe_ might not be valid anymore. |
| 1406 webframe_->set_plugin_delegate(NULL); | 1407 webframe_->set_plugin_delegate(NULL); |
| 1407 webframe_ = NULL; | 1408 webframe_ = NULL; |
| 1408 } | 1409 } |
| OLD | NEW |