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

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

Issue 1585163002: Media Session: prepare for implicit activation of user created session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Be clearer about session being a media_session Created 4 years, 11 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_FRAME_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 protected: 158 protected:
159 ~HTMLFrame() override; 159 ~HTMLFrame() override;
160 160
161 // WebFrameClient methods: 161 // WebFrameClient methods:
162 blink::WebMediaPlayer* createMediaPlayer( 162 blink::WebMediaPlayer* createMediaPlayer(
163 blink::WebLocalFrame* frame, 163 blink::WebLocalFrame* frame,
164 const blink::WebURL& url, 164 const blink::WebURL& url,
165 blink::WebMediaPlayerClient* client, 165 blink::WebMediaPlayerClient* client,
166 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 166 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
167 blink::WebContentDecryptionModule* initial_cdm, 167 blink::WebContentDecryptionModule* initial_cdm,
168 const blink::WebString& sink_id) override; 168 const blink::WebString& sink_id,
169 blink::WebMediaSession* media_session) override;
169 blink::WebFrame* createChildFrame( 170 blink::WebFrame* createChildFrame(
170 blink::WebLocalFrame* parent, 171 blink::WebLocalFrame* parent,
171 blink::WebTreeScopeType scope, 172 blink::WebTreeScopeType scope,
172 const blink::WebString& frame_ame, 173 const blink::WebString& frame_ame,
173 blink::WebSandboxFlags sandbox_flags, 174 blink::WebSandboxFlags sandbox_flags,
174 const blink::WebFrameOwnerProperties& frame_owner_properties) override; 175 const blink::WebFrameOwnerProperties& frame_owner_properties) override;
175 void frameDetached(blink::WebFrame* frame, 176 void frameDetached(blink::WebFrame* frame,
176 blink::WebFrameClient::DetachType type) override; 177 blink::WebFrameClient::DetachType type) override;
177 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override; 178 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
178 blink::WebNavigationPolicy decidePolicyForNavigation( 179 blink::WebNavigationPolicy decidePolicyForNavigation(
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 base::TimeTicks navigation_start_time_; 378 base::TimeTicks navigation_start_time_;
378 379
379 base::WeakPtrFactory<HTMLFrame> weak_factory_; 380 base::WeakPtrFactory<HTMLFrame> weak_factory_;
380 381
381 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); 382 DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
382 }; 383 };
383 384
384 } // namespace html_viewer 385 } // namespace html_viewer
385 386
386 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 387 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_frame.cc » ('j') | components/html_viewer/html_frame.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698