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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on mo time Created 7 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 | Annotate | Revision Log
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 CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 content::RenderView* render_view, 78 content::RenderView* render_view,
79 const base::FilePath& plugin_path) OVERRIDE; 79 const base::FilePath& plugin_path) OVERRIDE;
80 virtual bool HasErrorPage(int http_status_code, 80 virtual bool HasErrorPage(int http_status_code,
81 std::string* error_domain) OVERRIDE; 81 std::string* error_domain) OVERRIDE;
82 virtual void GetNavigationErrorStrings( 82 virtual void GetNavigationErrorStrings(
83 WebKit::WebFrame* frame, 83 WebKit::WebFrame* frame,
84 const WebKit::WebURLRequest& failed_request, 84 const WebKit::WebURLRequest& failed_request,
85 const WebKit::WebURLError& error, 85 const WebKit::WebURLError& error,
86 std::string* error_html, 86 std::string* error_html,
87 string16* error_description) OVERRIDE; 87 string16* error_description) OVERRIDE;
88 virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer( 88 virtual void DeferMediaLoad(content::RenderView* render_view,
89 content::RenderView* render_view, 89 const base::Closure& closure) OVERRIDE;
90 WebKit::WebFrame* frame,
91 WebKit::WebMediaPlayerClient* client,
92 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
93 const webkit_media::WebMediaPlayerParams& params) OVERRIDE;
94 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; 90 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
95 virtual bool AllowPopup() OVERRIDE; 91 virtual bool AllowPopup() OVERRIDE;
96 virtual bool ShouldFork(WebKit::WebFrame* frame, 92 virtual bool ShouldFork(WebKit::WebFrame* frame,
97 const GURL& url, 93 const GURL& url,
98 const std::string& http_method, 94 const std::string& http_method,
99 bool is_initial_navigation, 95 bool is_initial_navigation,
100 bool is_server_redirect, 96 bool is_server_redirect,
101 bool* send_referrer) OVERRIDE; 97 bool* send_referrer) OVERRIDE;
102 virtual bool WillSendRequest(WebKit::WebFrame* frame, 98 virtual bool WillSendRequest(WebKit::WebFrame* frame,
103 content::PageTransition transition_type, 99 content::PageTransition transition_type,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 #endif 198 #endif
203 199
204 #if defined(ENABLE_PLUGINS) 200 #if defined(ENABLE_PLUGINS)
205 std::set<std::string> allowed_file_handle_origins_; 201 std::set<std::string> allowed_file_handle_origins_;
206 #endif 202 #endif
207 }; 203 };
208 204
209 } // namespace chrome 205 } // namespace chrome
210 206
211 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 207 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | chrome/renderer/prerender/prerender_webmediaplayer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698