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

Side by Side Diff: webkit/glue/webview.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, 4 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 | « webkit/glue/glue_util.cc ('k') | webkit/glue/webview_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webview.h:r3734-4217,4606-5108,5177-5263
Merged /trunk/src/webkit/glue/webview.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 WEBKIT_GLUE_WEBVIEW_H_ 5 #ifndef WEBKIT_GLUE_WEBVIEW_H_
6 #define WEBKIT_GLUE_WEBVIEW_H_ 6 #define WEBKIT_GLUE_WEBVIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "webkit/api/public/WebWidget.h" 12 #include "webkit/api/public/WebWidget.h"
13 13
14 namespace WebKit { 14 namespace WebKit {
15 class WebDragData; 15 class WebDragData;
16 struct WebPoint; 16 struct WebPoint;
17 } 17 }
18 18
19 struct MediaPlayerAction;
19 struct WebPreferences; 20 struct WebPreferences;
20 class GURL; 21 class GURL;
21 class WebDevToolsAgent; 22 class WebDevToolsAgent;
22 class WebFrame; 23 class WebFrame;
23 class WebViewDelegate; 24 class WebViewDelegate;
24 25
25 // 26 //
26 // @class WebView 27 // @class WebView
27 // WebView manages the interaction between WebFrameViews and WebDataSources. 28 // WebView manages the interaction between WebFrameViews and WebDataSources.
28 // Modification of the policies and behavior of the WebKit is largely managed 29 // Modification of the policies and behavior of the WebKit is largely managed
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 virtual void HideAutofillPopup() = 0; 224 virtual void HideAutofillPopup() = 0;
224 225
225 // Returns development tools agent instance belonging to this view. 226 // Returns development tools agent instance belonging to this view.
226 virtual WebDevToolsAgent* GetWebDevToolsAgent() = 0; 227 virtual WebDevToolsAgent* GetWebDevToolsAgent() = 0;
227 228
228 // Makes the webview transparent. Useful if you want to have some custom 229 // Makes the webview transparent. Useful if you want to have some custom
229 // background behind it. 230 // background behind it.
230 virtual void SetIsTransparent(bool is_transparent) = 0; 231 virtual void SetIsTransparent(bool is_transparent) = 0;
231 virtual bool GetIsTransparent() const = 0; 232 virtual bool GetIsTransparent() const = 0;
232 233
234 // Performs an action from a context menu for the node at the given
235 // location.
236 virtual void MediaPlayerActionAt(int x,
237 int y,
238 const MediaPlayerAction& action) = 0;
239
233 private: 240 private:
234 DISALLOW_COPY_AND_ASSIGN(WebView); 241 DISALLOW_COPY_AND_ASSIGN(WebView);
235 }; 242 };
236 243
237 #endif // WEBKIT_GLUE_WEBVIEW_H_ 244 #endif // WEBKIT_GLUE_WEBVIEW_H_
OLDNEW
« no previous file with comments | « webkit/glue/glue_util.cc ('k') | webkit/glue/webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698