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

Unified Diff: chrome/plugin/webplugin_proxy.cc

Issue 155236: Revert change 20173 because it breaks the ui_tests, plugin_tests... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « chrome/plugin/webplugin_proxy.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/webplugin_proxy.cc
===================================================================
--- chrome/plugin/webplugin_proxy.cc (revision 20179)
+++ chrome/plugin/webplugin_proxy.cc (working copy)
@@ -13,7 +13,6 @@
#include "base/singleton.h"
#include "base/waitable_event.h"
#include "build/build_config.h"
-#include "chrome/common/child_process_logging.h"
#include "chrome/common/plugin_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/plugin/npobject_proxy.h"
@@ -36,8 +35,7 @@
WebPluginProxy::WebPluginProxy(
PluginChannel* channel,
int route_id,
- WebPluginDelegate* delegate,
- const GURL& page_url)
+ WebPluginDelegate* delegate)
: channel_(channel),
route_id_(route_id),
cp_browsing_context_(0),
@@ -45,7 +43,6 @@
plugin_element_(NULL),
delegate_(delegate),
waiting_for_paint_(false),
- page_url_(page_url),
ALLOW_THIS_IN_INITIALIZER_LIST(runnable_method_factory_(this))
{
}
@@ -162,9 +159,10 @@
if (!success)
return NULL;
- window_npobject_ = NPObjectProxy::Create(
- channel_, npobject_route_id, npobject_ptr, modal_dialog_event_.get(),
- page_url_);
+ window_npobject_ = NPObjectProxy::Create(channel_,
+ npobject_route_id,
+ npobject_ptr,
+ modal_dialog_event_.get());
return window_npobject_;
}
@@ -181,9 +179,10 @@
if (!success)
return NULL;
- plugin_element_ = NPObjectProxy::Create(
- channel_, npobject_route_id, npobject_ptr, modal_dialog_event_.get(),
- page_url_);
+ plugin_element_ = NPObjectProxy::Create(channel_,
+ npobject_route_id,
+ npobject_ptr,
+ modal_dialog_event_.get());
return plugin_element_;
}
@@ -519,8 +518,6 @@
}
void WebPluginProxy::OnPaint(const gfx::Rect& damaged_rect) {
- child_process_logging::ScopedActiveURLSetter url_setter(page_url_);
-
Paint(damaged_rect);
Send(new PluginHostMsg_InvalidateRect(route_id_, damaged_rect));
}
« no previous file with comments | « chrome/plugin/webplugin_proxy.h ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698