Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/render_message_filter.h" | 5 #include "content/browser/renderer_host/render_message_filter.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 case 1: | 573 case 1: |
| 574 key_size_in_bits = 1024; | 574 key_size_in_bits = 1024; |
| 575 break; | 575 break; |
| 576 default: | 576 default: |
| 577 DCHECK(false) << "Illegal key_size_index " << key_size_index; | 577 DCHECK(false) << "Illegal key_size_index " << key_size_index; |
| 578 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); | 578 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
| 579 Send(reply_msg); | 579 Send(reply_msg); |
| 580 return; | 580 return; |
| 581 } | 581 } |
| 582 | 582 |
| 583 if (!GetContentClient()->browser()->AllowKeygen(url, resource_context_)) { | |
|
Bernhard Bauer
2015/11/05 11:12:13
If you have this check anyway, why do you need the
svaldez
2015/11/05 16:35:20
The problem is that we want to have the Page Actio
Bernhard Bauer
2015/11/05 16:45:18
Wait, so you want to show something in the omnibox
| |
| 584 RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); | |
| 585 Send(reply_msg); | |
| 586 return; | |
| 587 } | |
| 588 | |
| 583 resource_context_->CreateKeygenHandler( | 589 resource_context_->CreateKeygenHandler( |
| 584 key_size_in_bits, | 590 key_size_in_bits, |
| 585 challenge_string, | 591 challenge_string, |
| 586 url, | 592 url, |
| 587 base::Bind( | 593 base::Bind( |
| 588 &RenderMessageFilter::PostKeygenToWorkerThread, this, reply_msg)); | 594 &RenderMessageFilter::PostKeygenToWorkerThread, this, reply_msg)); |
| 589 } | 595 } |
| 590 | 596 |
| 591 void RenderMessageFilter::PostKeygenToWorkerThread( | 597 void RenderMessageFilter::PostKeygenToWorkerThread( |
| 592 IPC::Message* reply_msg, | 598 IPC::Message* reply_msg, |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 688 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( | 694 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( |
| 689 gfx::GpuMemoryBufferId id, | 695 gfx::GpuMemoryBufferId id, |
| 690 uint32 sync_point) { | 696 uint32 sync_point) { |
| 691 DCHECK(BrowserGpuMemoryBufferManager::current()); | 697 DCHECK(BrowserGpuMemoryBufferManager::current()); |
| 692 | 698 |
| 693 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( | 699 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( |
| 694 id, PeerHandle(), render_process_id_, sync_point); | 700 id, PeerHandle(), render_process_id_, sync_point); |
| 695 } | 701 } |
| 696 | 702 |
| 697 } // namespace content | 703 } // namespace content |
| OLD | NEW |