Merge revision 997 changes:

- Linux: Fix compile errors (issue #852).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@998 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-01-16 20:20:41 +00:00
parent 006b235dc3
commit cf6dc70b4e
2 changed files with 19 additions and 3 deletions

View File

@ -2095,7 +2095,7 @@ void CefBrowserHostImpl::RunFileChooserOnUIThread(
if (client_.get()) {
CefRefPtr<CefDialogHandler> handler = client_->GetDialogHandler();
if (handler.get()) {
cef_file_dialog_mode_t mode;
cef_file_dialog_mode_t mode = FILE_DIALOG_OPEN;
switch (params.mode) {
case content::FileChooserParams::Open:
mode = FILE_DIALOG_OPEN;

View File

@ -1824,8 +1824,24 @@ class V8RendererTest : public ClientApp::RenderDelegate {
EXPECT_TRUE(task_runner->IsSame(task_runner_));
// Execute the callback asynchronously.
task_runner->PostTask(
NewCefRunnableMethod(this, &Handler::ExecCallback));
// Can't use templates with nested classes on Linux.
class Task : public CefTask {
public:
explicit Task(Handler* handler)
: handler_(handler) {
handler_->AddRef();
}
~Task() {
handler_->Release();
}
virtual void Execute() OVERRIDE {
handler_->ExecCallback();
}
private:
Handler* handler_;
IMPLEMENT_REFCOUNTING(Task);
};
task_runner->PostTask(new Task(this));
retval = CefV8Value::CreateBool(true);
return true;