diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:50:07 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 16:50:07 +0000 |
| commit | ae3ec240a09e84a3760c452cd594132cc26de955 (patch) | |
| tree | fdaad4bdd125b9d38376dbed64fc2b0b13e8ffdb | |
| parent | edd909b4e2e3869676b4a1720088803065a63653 (diff) | |
| download | chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.zip chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.tar.gz chromium_src-ae3ec240a09e84a3760c452cd594132cc26de955.tar.bz2 | |
Rollback the rollback of r1806. Wasn't the cause of the test failure.
Review URL: http://codereview.chromium.org/272
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1821 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_list.h | 2 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h index 6807a5f..1eac95a 100644 --- a/webkit/glue/plugins/plugin_list.h +++ b/webkit/glue/plugins/plugin_list.h @@ -151,9 +151,11 @@ class PluginList : public base::RefCounted<PluginList> { // Hardcoded logic to detect and load Java plugins void LoadJavaPlugin(); +#if defined(OS_WIN) // Search the registry at the given path and load plugins listed there. void LoadPluginsInRegistryFolder(HKEY root_key, const std::wstring& registry_folder); +#endif // true if we shouldn't load the new WMP plugin. bool dont_load_new_wmp_; diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 7ba384a..e169bc4 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -1014,7 +1014,7 @@ void WebFrameLoaderClient::startDownload(const ResourceRequest& request) { WebViewDelegate* d = webframe_->webview_impl()->delegate(); if (d) { const GURL url(webkit_glue::KURLToGURL(request.url())); - const GURL referrer(webkit_glue::StringToStdWString(request.httpReferrer())); + const GURL referrer(webkit_glue::StringToStdString(request.httpReferrer())); d->DownloadUrl(url, referrer); } } @@ -1173,7 +1173,7 @@ String WebFrameLoaderClient::generatedMIMETypeForURLScheme(const String& URLSche // function is WebView::registerViewClass, where it is used as part of the // process by which custom view classes for certain document representations // are registered. - String mimetype(L"x-apple-web-kit/"); + String mimetype("x-apple-web-kit/"); mimetype.append(URLScheme.lower()); return mimetype; } @@ -1304,7 +1304,7 @@ static char** ToArray(const Vector<WebCore::String> &vector) { for (index = 0; index < vector.size(); ++index) { WebCore::CString src = vector[index].utf8(); rv[index] = new char[src.length() + 1]; - strncpy_s(rv[index], src.length() + 1, src.data(), _TRUNCATE); + base::strlcpy(rv[index], src.data(), src.length() + 1); rv[index][src.length()] = '\0'; } rv[index] = 0; |