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

Side by Side Diff: content/browser/browser_plugin/test_browser_plugin_embedder.cc

Issue 10982068: Browser Plugin: Remove unnecessary references to frame_id (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/browser_plugin/test_browser_plugin_embedder.h" 5 #include "content/browser/browser_plugin/test_browser_plugin_embedder.h"
6 6
7 #include "base/time.h" 7 #include "base/time.h"
8 #include "content/browser/browser_plugin/browser_plugin_embedder.h" 8 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
9 #include "content/browser/browser_plugin/browser_plugin_guest.h" 9 #include "content/browser/browser_plugin/browser_plugin_guest.h"
10 #include "content/browser/renderer_host/render_view_host_impl.h" 10 #include "content/browser/renderer_host/render_view_host_impl.h"
11 #include "content/browser/web_contents/web_contents_impl.h" 11 #include "content/browser/web_contents/web_contents_impl.h"
12 #include "content/public/test/test_utils.h" 12 #include "content/public/test/test_utils.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 TestBrowserPluginEmbedder::TestBrowserPluginEmbedder( 16 TestBrowserPluginEmbedder::TestBrowserPluginEmbedder(
17 WebContentsImpl* web_contents, 17 WebContentsImpl* web_contents,
18 RenderViewHost* render_view_host) 18 RenderViewHost* render_view_host)
19 : BrowserPluginEmbedder(web_contents, render_view_host) { 19 : BrowserPluginEmbedder(web_contents, render_view_host) {
20 } 20 }
21 21
22 TestBrowserPluginEmbedder::~TestBrowserPluginEmbedder() { 22 TestBrowserPluginEmbedder::~TestBrowserPluginEmbedder() {
23 } 23 }
24 24
25 void TestBrowserPluginEmbedder::AddGuest(int instance_id, 25 void TestBrowserPluginEmbedder::AddGuest(int instance_id,
26 WebContents* guest_web_contents, 26 WebContents* guest_web_contents) {
27 int64 frame_id) { 27 BrowserPluginEmbedder::AddGuest(instance_id, guest_web_contents);
28 BrowserPluginEmbedder::AddGuest(instance_id, guest_web_contents, frame_id);
29 if (message_loop_runner_) 28 if (message_loop_runner_)
30 message_loop_runner_->Quit(); 29 message_loop_runner_->Quit();
31 } 30 }
32 31
33 void TestBrowserPluginEmbedder::WaitForGuestAdded() { 32 void TestBrowserPluginEmbedder::WaitForGuestAdded() {
34 // Check if guests were already created. 33 // Check if guests were already created.
35 if (guest_web_contents_by_instance_id_.size() > 0) 34 if (guest_web_contents_by_instance_id_.size() > 0)
36 return; 35 return;
37 // Wait otherwise. 36 // Wait otherwise.
38 message_loop_runner_ = new MessageLoopRunner(); 37 message_loop_runner_ = new MessageLoopRunner();
39 message_loop_runner_->Run(); 38 message_loop_runner_->Run();
40 } 39 }
41 40
42 } // namespace content 41 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/test_browser_plugin_embedder.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698