Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1286)

Unified Diff: content/renderer/browser_plugin/mock_browser_plugin_manager.cc

Issue 299753011: Move allocate instance id to chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: HasPermission function moved Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/browser_plugin/mock_browser_plugin_manager.cc
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
index 282edc0459083b8e60e4c5dc5008cf56542cb428..36d78b8675bf471e41f382c63b1afaa4026ebbd0 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
@@ -14,7 +14,8 @@ namespace content {
MockBrowserPluginManager::MockBrowserPluginManager(
RenderViewImpl* render_view)
: BrowserPluginManager(render_view),
- guest_instance_id_counter_(0) {
+ guest_instance_id_counter_(0),
+ last_plugin_(NULL) {
}
MockBrowserPluginManager::~MockBrowserPluginManager() {
@@ -24,18 +25,13 @@ BrowserPlugin* MockBrowserPluginManager::CreateBrowserPlugin(
RenderViewImpl* render_view,
blink::WebFrame* frame,
bool auto_navigate) {
- return new MockBrowserPlugin(render_view, frame, auto_navigate);
+ last_plugin_ = new MockBrowserPlugin(render_view, frame, auto_navigate);
+ return last_plugin_;
}
void MockBrowserPluginManager::AllocateInstanceID(
- const base::WeakPtr<BrowserPlugin>& browser_plugin) {
- int guest_instance_id = ++guest_instance_id_counter_;
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&MockBrowserPluginManager::AllocateInstanceIDACK,
- this,
- browser_plugin.get(),
- guest_instance_id));
+ BrowserPlugin* browser_plugin) {
+ AllocateInstanceIDACK(browser_plugin, ++guest_instance_id_counter_);
}
void MockBrowserPluginManager::AllocateInstanceIDACK(
« no previous file with comments | « content/renderer/browser_plugin/mock_browser_plugin_manager.h ('k') | extensions/browser/extension_function_histogram_value.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698