diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:53:01 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:53:01 +0000 |
| commit | af886775b3f4888b60c1d379dd2b484ac0fa8833 (patch) | |
| tree | 6c58ceeaa2fa4d12b20d1e5f986bdee34ded6354 /content/browser/browser_plugin/browser_plugin_guest_helper.cc | |
| parent | 49306751db60b2437a17dcfcedd616c4d97e7ee8 (diff) | |
| download | chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.zip chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.tar.gz chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.tar.bz2 | |
Revert 157650 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.appspot.com/10560022, it seems I cannot upload patch to that issue (since I'm not owner), I'm creating a new one.
Introduced too many static initializers - broke linux sizes.
Split Embedder and Guest 'roles' for browser plugin, web contents can now play any or both roles, main idea is to have more readable separation between the two.
Also stop creating browser_plugin counterpart in browser/host for every web_contents, instead create them only when there's a browser_plugin element.
BUG= 141232
Review URL: https://chromiumcodereview.appspot.com/10868012
TBR=lazyboy@chromium.org
Review URL: https://codereview.chromium.org/10946044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest_helper.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest_helper.cc | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest_helper.cc b/content/browser/browser_plugin/browser_plugin_guest_helper.cc deleted file mode 100644 index 9ca3c10..0000000 --- a/content/browser/browser_plugin/browser_plugin_guest_helper.cc +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/browser/browser_plugin/browser_plugin_guest_helper.h" - -#include "content/browser/browser_plugin/browser_plugin_guest.h" -#include "content/browser/web_contents/web_contents_impl.h" -#include "content/common/view_messages.h" -#include "content/public/browser/render_view_host.h" - -namespace content { - -BrowserPluginGuestHelper::BrowserPluginGuestHelper( - BrowserPluginGuest* guest, - RenderViewHost* render_view_host) - : RenderViewHostObserver(render_view_host), - guest_(guest) { -} - -BrowserPluginGuestHelper::~BrowserPluginGuestHelper() { -} - -bool BrowserPluginGuestHelper::OnMessageReceived( - const IPC::Message& message) { - bool handled = true; - IPC_BEGIN_MESSAGE_MAP(BrowserPluginGuestHelper, message) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect) - IPC_MESSAGE_HANDLER(ViewHostMsg_HandleInputEvent_ACK, OnHandleInputEventAck) - IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus) - IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) - IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnSetCursor) - IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP() - return handled; -} - -void BrowserPluginGuestHelper::OnUpdateRect( - const ViewHostMsg_UpdateRect_Params& params) { - guest_->UpdateRect(render_view_host(), params); -} - -void BrowserPluginGuestHelper::OnHandleInputEventAck( - WebKit::WebInputEvent::Type event_type, - bool processed) { - guest_->HandleInputEventAck(render_view_host(), processed); -} - -void BrowserPluginGuestHelper::OnTakeFocus(bool reverse) { - guest_->ViewTakeFocus(reverse); -} - -void BrowserPluginGuestHelper::OnShowWidget(int route_id, - const gfx::Rect& initial_pos) { - guest_->ShowWidget(render_view_host(), route_id, initial_pos); -} - -void BrowserPluginGuestHelper::OnSetCursor(const WebCursor& cursor) { - guest_->SetCursor(cursor); -} - -} // namespace content |