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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.h

Issue 159471: Merge 21466 - Allow the browser to send actions back to the render for media ... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_view_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/renderer_host/render_view_host.h:r21466
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "chrome/browser/extensions/extension_function_dispatcher.h" 12 #include "chrome/browser/extensions/extension_function_dispatcher.h"
13 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 13 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
14 #include "chrome/browser/renderer_host/render_widget_host.h" 14 #include "chrome/browser/renderer_host/render_widget_host.h"
15 #include "chrome/common/modal_dialog_event.h" 15 #include "chrome/common/modal_dialog_event.h"
16 #include "chrome/common/notification_registrar.h" 16 #include "chrome/common/notification_registrar.h"
17 #include "chrome/common/page_zoom.h" 17 #include "chrome/common/page_zoom.h"
18 #include "webkit/api/public/WebConsoleMessage.h" 18 #include "webkit/api/public/WebConsoleMessage.h"
19 #include "webkit/glue/autofill_form.h" 19 #include "webkit/glue/autofill_form.h"
20 #include "webkit/glue/password_form_dom_manager.h" 20 #include "webkit/glue/password_form_dom_manager.h"
21 #include "webkit/glue/window_open_disposition.h" 21 #include "webkit/glue/window_open_disposition.h"
22 22
23 class RenderViewHostDelegate; 23 class RenderViewHostDelegate;
24 class SiteInstance; 24 class SiteInstance;
25 class SkBitmap; 25 class SkBitmap;
26 class ViewMsg_Navigate; 26 class ViewMsg_Navigate;
27 struct ContextMenuParams; 27 struct ContextMenuParams;
28 struct MediaPlayerAction;
28 struct ViewHostMsg_DidPrintPage_Params; 29 struct ViewHostMsg_DidPrintPage_Params;
29 struct ViewMsg_Navigate_Params; 30 struct ViewMsg_Navigate_Params;
30 struct WebDropData; 31 struct WebDropData;
31 struct WebPreferences; 32 struct WebPreferences;
32 33
33 namespace base { 34 namespace base {
34 class WaitableEvent; 35 class WaitableEvent;
35 } 36 }
36 37
37 namespace gfx { 38 namespace gfx {
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 const std::wstring& prompt); 286 const std::wstring& prompt);
286 287
287 // This function is called when the JavaScript message box window has been 288 // This function is called when the JavaScript message box window has been
288 // destroyed. 289 // destroyed.
289 void JavaScriptMessageBoxWindowDestroyed(); 290 void JavaScriptMessageBoxWindowDestroyed();
290 291
291 // Notifies the RenderView that the modal html dialog has been closed. 292 // Notifies the RenderView that the modal html dialog has been closed.
292 void ModalHTMLDialogClosed(IPC::Message* reply_msg, 293 void ModalHTMLDialogClosed(IPC::Message* reply_msg,
293 const std::string& json_retval); 294 const std::string& json_retval);
294 295
296 // Send an action to the media player element located at |x|, |y|.
297 void MediaPlayerActionAt(int x, int y, const MediaPlayerAction& action);
298
295 // Copies the image at the specified point. 299 // Copies the image at the specified point.
296 void CopyImageAt(int x, int y); 300 void CopyImageAt(int x, int y);
297 301
298 // Notifies the renderer that a drag and drop was cancelled. This is 302 // Notifies the renderer that a drag and drop was cancelled. This is
299 // necessary because the render may be the one that started the drag. 303 // necessary because the render may be the one that started the drag.
300 void DragSourceCancelledAt( 304 void DragSourceCancelledAt(
301 int client_x, int client_y, int screen_x, int screen_y); 305 int client_x, int client_y, int screen_x, int screen_y);
302 306
303 // Notifies the renderer that a drop occurred. This is necessary because the 307 // Notifies the renderer that a drop occurred. This is necessary because the
304 // render may be the one that started the drag. 308 // render may be the one that started the drag.
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 // While in this mode, mouse click is converted into InspectElement 628 // While in this mode, mouse click is converted into InspectElement
625 // command. 629 // command.
626 bool in_inspect_element_mode_; 630 bool in_inspect_element_mode_;
627 631
628 NotificationRegistrar registrar_; 632 NotificationRegistrar registrar_;
629 633
630 DISALLOW_COPY_AND_ASSIGN(RenderViewHost); 634 DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
631 }; 635 };
632 636
633 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 637 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698