| 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 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 | 10 |
| (...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1397 argv = ToArray(updated_param_values); | 1397 argv = ToArray(updated_param_values); |
| 1398 argc = static_cast<int>(updated_param_names.size()); | 1398 argc = static_cast<int>(updated_param_names.size()); |
| 1399 } else { | 1399 } else { |
| 1400 argn = ToArray(param_names); | 1400 argn = ToArray(param_names); |
| 1401 argv = ToArray(param_values); | 1401 argv = ToArray(param_values); |
| 1402 argc = static_cast<int>(param_names.size()); | 1402 argc = static_cast<int>(param_names.size()); |
| 1403 } | 1403 } |
| 1404 | 1404 |
| 1405 Widget* result = WebPluginImpl::Create(gurl, argn, argv, argc, element, | 1405 Widget* result = WebPluginImpl::Create(gurl, argn, argv, argc, element, |
| 1406 webframe_, plugin_delegate, | 1406 webframe_, plugin_delegate, |
| 1407 load_manually); | 1407 load_manually, actual_mime_type); |
| 1408 | 1408 |
| 1409 DeleteToArray(argn); | 1409 DeleteToArray(argn); |
| 1410 DeleteToArray(argv); | 1410 DeleteToArray(argv); |
| 1411 | 1411 |
| 1412 return result; | 1412 return result; |
| 1413 } | 1413 } |
| 1414 | 1414 |
| 1415 // This method gets called when a plugin is put in place of html content | 1415 // This method gets called when a plugin is put in place of html content |
| 1416 // (e.g., acrobat reader). | 1416 // (e.g., acrobat reader). |
| 1417 void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget) { | 1417 void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget) { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1478 if (!middle_or_ctrl && !shift && !alt) | 1478 if (!middle_or_ctrl && !shift && !alt) |
| 1479 return false; | 1479 return false; |
| 1480 | 1480 |
| 1481 DCHECK(disposition); | 1481 DCHECK(disposition); |
| 1482 if (middle_or_ctrl) | 1482 if (middle_or_ctrl) |
| 1483 *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; | 1483 *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; |
| 1484 else | 1484 else |
| 1485 *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK; | 1485 *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK; |
| 1486 return true; | 1486 return true; |
| 1487 } | 1487 } |
| OLD | NEW |