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

Side by Side Diff: android_webview/browser/aw_content_browser_client.h

Issue 231933006: Move ExternalVideoSurfaceHolder from WebContents UserData to BrowserMediaPlayerManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "android_webview/browser/aw_web_preferences_populater.h" 8 #include "android_webview/browser/aw_web_preferences_populater.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 virtual void DidCreatePpapiPlugin( 157 virtual void DidCreatePpapiPlugin(
158 content::BrowserPpapiHost* browser_host) OVERRIDE; 158 content::BrowserPpapiHost* browser_host) OVERRIDE;
159 virtual bool AllowPepperSocketAPI( 159 virtual bool AllowPepperSocketAPI(
160 content::BrowserContext* browser_context, 160 content::BrowserContext* browser_context,
161 const GURL& url, 161 const GURL& url,
162 bool private_api, 162 bool private_api,
163 const content::SocketPermissionRequest* params) OVERRIDE; 163 const content::SocketPermissionRequest* params) OVERRIDE;
164 virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh, 164 virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
165 const GURL& url, 165 const GURL& url,
166 WebPreferences* web_prefs) OVERRIDE; 166 WebPreferences* web_prefs) OVERRIDE;
167 #if defined(VIDEO_HOLE)
168 virtual content::ExternalVideoSurfaceContainer*
169 CreateExternalVideoSurfaceContainer(
170 content::WebContents* web_contents) OVERRIDE;
171 #endif
167 172
168 private: 173 private:
169 // Android WebView currently has a single global (non-off-the-record) browser 174 // Android WebView currently has a single global (non-off-the-record) browser
170 // context. 175 // context.
171 scoped_ptr<AwBrowserContext> browser_context_; 176 scoped_ptr<AwBrowserContext> browser_context_;
172 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_; 177 scoped_ptr<AwWebPreferencesPopulater> preferences_populater_;
173 178
174 JniDependencyFactory* native_factory_; 179 JniDependencyFactory* native_factory_;
175 180
176 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient); 181 DISALLOW_COPY_AND_ASSIGN(AwContentBrowserClient);
177 }; 182 };
178 183
179 } // namespace android_webview 184 } // namespace android_webview
180 185
181 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_ 186 #endif // ANDROID_WEBVIEW_LIB_AW_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698