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

Side by Side Diff: components/html_viewer/html_document.h

Issue 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed review comments Created 5 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
« no previous file with comments | « components/html_viewer/frame.cc ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void InitGlobalStateAndLoadIfNecessary(); 97 void InitGlobalStateAndLoadIfNecessary();
98 98
99 // WebViewClient methods: 99 // WebViewClient methods:
100 virtual blink::WebStorageNamespace* createSessionStorageNamespace(); 100 virtual blink::WebStorageNamespace* createSessionStorageNamespace();
101 101
102 // WebWidgetClient methods: 102 // WebWidgetClient methods:
103 void initializeLayerTreeView() override; 103 void initializeLayerTreeView() override;
104 blink::WebLayerTreeView* layerTreeView() override; 104 blink::WebLayerTreeView* layerTreeView() override;
105 105
106 // WebFrameClient methods: 106 // WebFrameClient methods:
107 // TODO(srirama): Remove this method once blink updated.
107 virtual blink::WebMediaPlayer* createMediaPlayer( 108 virtual blink::WebMediaPlayer* createMediaPlayer(
108 blink::WebLocalFrame* frame, 109 blink::WebLocalFrame* frame,
109 const blink::WebURL& url, 110 const blink::WebURL& url,
110 blink::WebMediaPlayerClient* client, 111 blink::WebMediaPlayerClient* client,
111 blink::WebContentDecryptionModule* initial_cdm); 112 blink::WebContentDecryptionModule* initial_cdm);
113 virtual blink::WebMediaPlayer* createMediaPlayer(
114 blink::WebLocalFrame* frame,
115 const blink::WebURL& url,
116 blink::WebMediaPlayerClient* client,
117 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
118 blink::WebContentDecryptionModule* initial_cdm);
112 virtual blink::WebFrame* createChildFrame( 119 virtual blink::WebFrame* createChildFrame(
113 blink::WebLocalFrame* parent, 120 blink::WebLocalFrame* parent,
114 blink::WebTreeScopeType scope, 121 blink::WebTreeScopeType scope,
115 const blink::WebString& frameName, 122 const blink::WebString& frameName,
116 blink::WebSandboxFlags sandboxFlags); 123 blink::WebSandboxFlags sandboxFlags);
117 virtual void frameDetached(blink::WebFrame* frame, DetachType type); 124 virtual void frameDetached(blink::WebFrame* frame, DetachType type);
118 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 125 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
119 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 126 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
120 const NavigationPolicyInfo& info); 127 const NavigationPolicyInfo& info);
121 virtual blink::WebGeolocationClient* geolocationClient(); 128 virtual blink::WebGeolocationClient* geolocationClient();
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 scoped_ptr<DevToolsAgentImpl> devtools_agent_; 192 scoped_ptr<DevToolsAgentImpl> devtools_agent_;
186 193
187 DeleteCallback delete_callback_; 194 DeleteCallback delete_callback_;
188 195
189 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 196 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
190 }; 197 };
191 198
192 } // namespace html_viewer 199 } // namespace html_viewer
193 200
194 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 201 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « components/html_viewer/frame.cc ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698