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

Unified Diff: content/browser/browser_plugin/test_browser_plugin_guest.cc

Issue 11606005: Browser Plugin: Simplify BrowserPluginGuestHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT Created 8 years 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/browser/browser_plugin/test_browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.cc b/content/browser/browser_plugin/test_browser_plugin_guest.cc
index 41c81c53df271c9170d5d4f64c46fbb4dd394bf5..b39b43f4904a7b63071638da9ae4091495891dbe 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.cc
@@ -70,9 +70,8 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
if (msg->type() == BrowserPluginMsg_UpdateRect::ID) {
update_rect_count_++;
int instance_id = 0;
- int message_id = 0;
BrowserPluginMsg_UpdateRect_Params params;
- BrowserPluginMsg_UpdateRect::Read(msg, &instance_id, &message_id, &params);
+ BrowserPluginMsg_UpdateRect::Read(msg, &instance_id, &params);
last_view_size_observed_ = params.view_size;
if (!expected_auto_view_size_.IsEmpty() &&
expected_auto_view_size_ == params.view_size) {
@@ -245,11 +244,11 @@ void TestBrowserPluginGuest::SetFocus(bool focused) {
BrowserPluginGuest::SetFocus(focused);
}
-bool TestBrowserPluginGuest::ViewTakeFocus(bool reverse) {
+void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
advance_focus_observed_ = true;
if (advance_focus_message_loop_runner_)
advance_focus_message_loop_runner_->Quit();
- return BrowserPluginGuest::ViewTakeFocus(reverse);
+ BrowserPluginGuest::OnTakeFocus(reverse);
}
void TestBrowserPluginGuest::Reload() {
« no previous file with comments | « content/browser/browser_plugin/test_browser_plugin_guest.h ('k') | content/common/browser_plugin_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698