Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

Unified Diff: chrome/test/pyautolib/pyautolib.i

Issue 9705052: Revert 126777 - Broke 'win' trybot (shared + all = fails linking pyautolib due to over swigging) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/functional/https.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyautolib.i
===================================================================
--- chrome/test/pyautolib/pyautolib.i (revision 126847)
+++ chrome/test/pyautolib/pyautolib.i (working copy)
@@ -17,10 +17,8 @@
%module(docstring="Python interface to Automation Proxy.") pyautolib
%feature("autodoc", "1");
-%include <cpointer.i>
-%include <std_string.i>
%include <std_wstring.i>
-%include <typemaps.i>
+%include <std_string.i>
%include "chrome/test/pyautolib/argc_argv.i"
@@ -32,11 +30,6 @@
%include "chrome/app/chrome_dll_resource.h"
%include "chrome/common/automation_constants.h"
%include "chrome/common/pref_names.h"
-%include "content/public/common/page_type.h"
-%include "content/public/common/security_style.h"
-// Must come before cert_status_flags.h
-%include "net/base/net_export.h"
-%include "net/base/cert_status_flags.h"
%{
#include "chrome/common/automation_constants.h"
@@ -154,42 +147,6 @@
"button, if false to 'Take me out of there' button.")
TakeActionOnSSLBlockingPage;
bool TakeActionOnSSLBlockingPage(bool proceed);
- %extend {
- %feature("docstring", "Retrieves the different security states for the "
- "current tab.")
- GetSecurityState;
- PyObject* GetSecurityState() {
- content::SecurityStyle security_style;
- net::CertStatus ssl_cert_status;
- int insecure_content_status;
- PyObject* result_dict = PyDict_New();
- if ($self->GetSecurityState(
- &security_style, &ssl_cert_status, &insecure_content_status)) {
- PyDict_SetItem(result_dict, PyString_FromString("security_style"),
- PyInt_FromLong(security_style));
- PyDict_SetItem(result_dict, PyString_FromString("ssl_cert_status"),
- PyInt_FromLong(ssl_cert_status));
- PyDict_SetItem(result_dict,
- PyString_FromString("insecure_content_status"),
- PyInt_FromLong(insecure_content_status));
- }
- return result_dict;
- }
- };
- %extend {
- %feature("docstring", "Returns the type of page currently showing "
- "(normal, interstitial, error.")
- GetPageType;
- PyObject* GetPageType() {
- content::PageType page_type;
- PyObject* result_dict = PyDict_New();
- if ($self->GetPageType(&page_type)) {
- PyDict_SetItem(result_dict, PyString_FromString("page_type"),
- PyInt_FromLong(page_type));
- }
- return result_dict;
- }
- };
// HTTP Auth
%feature("docstring",
@@ -518,6 +475,3 @@
%{
typedef net::TestServer::HTTPSOptions HTTPSOptions;
%}
-
-%pointer_class(int, int_ptr);
-%pointer_class(uint32, uint32_ptr);
« no previous file with comments | « chrome/test/functional/https.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698