mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	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:
		| @@ -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() { | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user