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

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

Issue 1234573004: Remove old createMediaPlayer method from WebFrameClient implementations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed redundant include 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 | « no previous file | components/html_viewer/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_FRAME_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_FRAME_H_
6 #define COMPONENTS_HTML_VIEWER_FRAME_H_ 6 #define COMPONENTS_HTML_VIEWER_FRAME_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override; 126 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
127 void OnViewFocusChanged(mojo::View* gained_focus, 127 void OnViewFocusChanged(mojo::View* gained_focus,
128 mojo::View* lost_focus) override; 128 mojo::View* lost_focus) override;
129 129
130 // WebViewClient methods: 130 // WebViewClient methods:
131 virtual void initializeLayerTreeView() override; 131 virtual void initializeLayerTreeView() override;
132 virtual blink::WebLayerTreeView* layerTreeView() override; 132 virtual blink::WebLayerTreeView* layerTreeView() override;
133 virtual blink::WebStorageNamespace* createSessionStorageNamespace(); 133 virtual blink::WebStorageNamespace* createSessionStorageNamespace();
134 134
135 // WebFrameClient methods: 135 // WebFrameClient methods:
136 // TODO(srirama): Remove this method once blink updated.
137 virtual blink::WebMediaPlayer* createMediaPlayer( 136 virtual blink::WebMediaPlayer* createMediaPlayer(
138 blink::WebLocalFrame* frame, 137 blink::WebLocalFrame* frame,
139 const blink::WebURL& url, 138 const blink::WebURL& url,
140 blink::WebMediaPlayerClient* client,
141 blink::WebContentDecryptionModule* initial_cdm);
142 virtual blink::WebMediaPlayer* createMediaPlayer(
143 blink::WebLocalFrame* frame,
144 const blink::WebURL& url,
145 blink::WebMediaPlayerClient* client, 139 blink::WebMediaPlayerClient* client,
146 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 140 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
147 blink::WebContentDecryptionModule* initial_cdm); 141 blink::WebContentDecryptionModule* initial_cdm);
148 virtual blink::WebFrame* createChildFrame( 142 virtual blink::WebFrame* createChildFrame(
149 blink::WebLocalFrame* parent, 143 blink::WebLocalFrame* parent,
150 blink::WebTreeScopeType scope, 144 blink::WebTreeScopeType scope,
151 const blink::WebString& frame_ame, 145 const blink::WebString& frame_ame,
152 blink::WebSandboxFlags sandbox_flags); 146 blink::WebSandboxFlags sandbox_flags);
153 virtual void frameDetached(blink::WebFrame* frame, 147 virtual void frameDetached(blink::WebFrame* frame,
154 blink::WebFrameClient::DetachType type); 148 blink::WebFrameClient::DetachType type);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 blink::WebTreeScopeType scope_; 188 blink::WebTreeScopeType scope_;
195 189
196 base::WeakPtrFactory<Frame> weak_factory_; 190 base::WeakPtrFactory<Frame> weak_factory_;
197 191
198 DISALLOW_COPY_AND_ASSIGN(Frame); 192 DISALLOW_COPY_AND_ASSIGN(Frame);
199 }; 193 };
200 194
201 } // namespace html_viewer 195 } // namespace html_viewer
202 196
203 #endif // COMPONENTS_HTML_VIEWER_FRAME_H_ 197 #endif // COMPONENTS_HTML_VIEWER_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698