diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-06 20:21:59 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-06 20:21:59 +0000 |
commit | 7ea066a9c3e54b7a2fd0c2ac30c8f4a64cf8eb90 (patch) | |
tree | 2f283b622f4ee681e05e7e6119903146f6f4d1ea /chrome/browser/ssl/ssl_manager.cc | |
parent | d2515f6e52f42d4baaa3c676ba1370ffa1f263eb (diff) | |
download | chromium_src-7ea066a9c3e54b7a2fd0c2ac30c8f4a64cf8eb90.zip chromium_src-7ea066a9c3e54b7a2fd0c2ac30c8f4a64cf8eb90.tar.gz chromium_src-7ea066a9c3e54b7a2fd0c2ac30c8f4a64cf8eb90.tar.bz2 |
Stop serializing WebString over IPC. The new rule is that only POD (plain old
data) types from WebKit API are allowed to be used in the browser process.
I added a big note about this to webkit_param_traits.h to explain the details
of this decision.
R=dglazkov
Review URL: http://codereview.chromium.org/62032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl/ssl_manager.cc')
-rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 42c6ec0..2d953eb 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -28,7 +28,6 @@ #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" -#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" #include "webkit/glue/resource_type.h" #if defined(OS_WIN) @@ -179,14 +178,15 @@ bool SSLManager::SetMaxSecurityStyle(SecurityStyle style) { } // Delegate API method. -void SSLManager::AddMessageToConsole(const WebConsoleMessage& message) { +void SSLManager::AddMessageToConsole(const string16& message, + const WebConsoleMessage::Level& level) { TabContents* tab_contents = controller_->tab_contents(); WebContents* web_contents = tab_contents->AsWebContents(); if (!web_contents) return; web_contents->render_view_host()->AddMessageToConsole( - std::wstring(), message); + string16(), message, level); } // Delegate API method. |