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

Side by Side Diff: android_webview/renderer/aw_content_renderer_client.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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 | « android_webview/renderer/DEPS ('k') | android_webview/renderer/aw_content_renderer_client.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include "content/public/renderer/content_renderer_client.h" 8 #include "content/public/renderer/content_renderer_client.h"
9 9
10 #include "android_webview/renderer/aw_render_process_observer.h" 10 #include "android_webview/renderer/aw_render_process_observer.h"
(...skipping 20 matching lines...) Expand all
31 content::RenderView* render_view, 31 content::RenderView* render_view,
32 blink::WebFrame* frame, 32 blink::WebFrame* frame,
33 const blink::WebURLRequest& failed_request, 33 const blink::WebURLRequest& failed_request,
34 const blink::WebURLError& error, 34 const blink::WebURLError& error,
35 std::string* error_html, 35 std::string* error_html,
36 base::string16* error_description) override; 36 base::string16* error_description) override;
37 virtual unsigned long long VisitedLinkHash(const char* canonical_url, 37 virtual unsigned long long VisitedLinkHash(const char* canonical_url,
38 size_t length) override; 38 size_t length) override;
39 virtual bool IsLinkVisited(unsigned long long link_hash) override; 39 virtual bool IsLinkVisited(unsigned long long link_hash) override;
40 virtual void AddKeySystems( 40 virtual void AddKeySystems(
41 std::vector<content::KeySystemInfo>* key_systems) override; 41 std::vector<media::KeySystemInfo>* key_systems) override;
42 42
43 virtual bool HandleNavigation(content::RenderFrame* render_frame, 43 virtual bool HandleNavigation(content::RenderFrame* render_frame,
44 content::DocumentState* document_state, 44 content::DocumentState* document_state,
45 int opener_id, 45 int opener_id,
46 blink::WebFrame* frame, 46 blink::WebFrame* frame,
47 const blink::WebURLRequest& request, 47 const blink::WebURLRequest& request,
48 blink::WebNavigationType type, 48 blink::WebNavigationType type,
49 blink::WebNavigationPolicy default_policy, 49 blink::WebNavigationPolicy default_policy,
50 bool is_redirect) override; 50 bool is_redirect) override;
51 virtual bool ShouldOverridePageVisibilityState( 51 virtual bool ShouldOverridePageVisibilityState(
52 const content::RenderFrame* render_frame, 52 const content::RenderFrame* render_frame,
53 blink::WebPageVisibilityState* override_state) override; 53 blink::WebPageVisibilityState* override_state) override;
54 54
55 private: 55 private:
56 scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_; 56 scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_;
57 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_; 57 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
58 }; 58 };
59 59
60 } // namespace android_webview 60 } // namespace android_webview
61 61
62 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 62 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « android_webview/renderer/DEPS ('k') | android_webview/renderer/aw_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698