From 7b91ff926626965002630bdd50dfae83caad17f3 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 10 Jan 2011 00:23:42 +0000 Subject: [PATCH] Fix mac compile errors. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@160 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_resource_loader_bridge.cc | 2 +- libcef/cef_process_ui_thread_mac.mm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libcef/browser_resource_loader_bridge.cc b/libcef/browser_resource_loader_bridge.cc index 4b324aea9..26cf2bc2e 100644 --- a/libcef/browser_resource_loader_bridge.cc +++ b/libcef/browser_resource_loader_bridge.cc @@ -199,7 +199,7 @@ class RequestProxy : public net::URLRequest::Delegate, if (allow_download && webkit_glue::ShouldDownload(content_disposition, info.mime_type)) { FilePath path(net::GetSuggestedFilename(url, content_disposition, - info.charset, FilePath(L"download"))); + info.charset, FilePath(FILE_PATH_LITERAL("download")))); CefRefPtr dl_handler; if (handler->HandleDownloadResponse(browser_, info.mime_type, path.value(), info.content_length, dl_handler) == diff --git a/libcef/cef_process_ui_thread_mac.mm b/libcef/cef_process_ui_thread_mac.mm index dc592a278..d5f460e10 100644 --- a/libcef/cef_process_ui_thread_mac.mm +++ b/libcef/cef_process_ui_thread_mac.mm @@ -9,11 +9,6 @@ #include "base/message_pump_mac.h" #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h" -namespace { - -// Memory autorelease pool. -static NSAutoreleasePool* g_autopool = nil; - // CrAppProtocol implementation. @interface CrApplication : NSApplication { @private @@ -35,6 +30,11 @@ static NSAutoreleasePool* g_autopool = nil; } @end +namespace { + +// Memory autorelease pool. +static NSAutoreleasePool* g_autopool = nil; + void RunLoopObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void* info) {