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

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: Add parameter names, also for unused variables Created 4 years, 10 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 | « no previous file | components/html_viewer/html_frame.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 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 ~HTMLFrame() override; 160 ~HTMLFrame() override;
161 161
162 // WebFrameClient methods: 162 // WebFrameClient methods:
163 blink::WebMediaPlayer* createMediaPlayer( 163 blink::WebMediaPlayer* createMediaPlayer(
164 blink::WebLocalFrame* frame, 164 blink::WebLocalFrame* frame,
165 blink::WebMediaPlayer::LoadType load_type, 165 blink::WebMediaPlayer::LoadType load_type,
166 const blink::WebURL& url, 166 const blink::WebURL& url,
167 blink::WebMediaPlayerClient* client, 167 blink::WebMediaPlayerClient* client,
168 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 168 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
169 blink::WebContentDecryptionModule* initial_cdm, 169 blink::WebContentDecryptionModule* initial_cdm,
170 const blink::WebString& sink_id) override; 170 const blink::WebString& sink_id,
171 blink::WebMediaSession* media_session) override;
171 blink::WebFrame* createChildFrame( 172 blink::WebFrame* createChildFrame(
172 blink::WebLocalFrame* parent, 173 blink::WebLocalFrame* parent,
173 blink::WebTreeScopeType scope, 174 blink::WebTreeScopeType scope,
174 const blink::WebString& frame_ame, 175 const blink::WebString& frame_ame,
175 blink::WebSandboxFlags sandbox_flags, 176 blink::WebSandboxFlags sandbox_flags,
176 const blink::WebFrameOwnerProperties& frame_owner_properties) override; 177 const blink::WebFrameOwnerProperties& frame_owner_properties) override;
177 void frameDetached(blink::WebFrame* frame, 178 void frameDetached(blink::WebFrame* frame,
178 blink::WebFrameClient::DetachType type) override; 179 blink::WebFrameClient::DetachType type) override;
179 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override; 180 blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
180 blink::WebNavigationPolicy decidePolicyForNavigation( 181 blink::WebNavigationPolicy decidePolicyForNavigation(
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 base::TimeTicks navigation_start_time_; 380 base::TimeTicks navigation_start_time_;
380 381
381 base::WeakPtrFactory<HTMLFrame> weak_factory_; 382 base::WeakPtrFactory<HTMLFrame> weak_factory_;
382 383
383 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); 384 DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
384 }; 385 };
385 386
386 } // namespace html_viewer 387 } // namespace html_viewer
387 388
388 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 389 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698