bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Mac/Linux compile errors. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@705 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-06-22 19:25:44 +00:00
parent a6aded4716
commit c167b5f3a6
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cef1/libcef/drag_data_impl.cc
View File

@ -35,11 +35,11 @@ CefString CefDragDataImpl::GetLinkMetadata() {
}
CefString CefDragDataImpl::GetFragmentText() {
return data_.text.is_null() ? CefString() : data_.text.string();
return data_.text.is_null() ? CefString() : CefString(data_.text.string());
}
CefString CefDragDataImpl::GetFragmentHtml() {
return data_.html.is_null() ? CefString() : data_.html.string();
return data_.html.is_null() ? CefString() : CefString(data_.html.string());
}
CefString CefDragDataImpl::GetFragmentBaseURL() {

16
cef1/libcef/sqlite_diagnostics_stub.cc
View File

@ -3,8 +3,24 @@
// be found in the LICENSE file.
#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
#include "content/public/common/url_constants.h"
// Used by SQLitePersistentCookieStore
sql::ErrorDelegate* GetErrorHandlerForCookieDb() {
return NULL;
}
namespace chrome {
// Used by ClearOnExitPolicy
const char kHttpScheme[] = "http";
const char kHttpsScheme[] = "https";
} // namespace chrome
namespace content {
// Used by ClearOnExitPolicy
const char kStandardSchemeSeparator[] = "://";
} // namespace content