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

Side by Side Diff: chromecast/browser/cast_content_browser_client.h

Issue 999243002: Chromecast buildfix: ClientCertificateDelegate changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 const base::CommandLine& command_line, 91 const base::CommandLine& command_line,
92 int child_process_id, 92 int child_process_id,
93 content::FileDescriptorInfo* mappings) override; 93 content::FileDescriptorInfo* mappings) override;
94 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) 94 #if defined(OS_ANDROID) && defined(VIDEO_HOLE)
95 content::ExternalVideoSurfaceContainer* 95 content::ExternalVideoSurfaceContainer*
96 OverrideCreateExternalVideoSurfaceContainer( 96 OverrideCreateExternalVideoSurfaceContainer(
97 content::WebContents* web_contents) override; 97 content::WebContents* web_contents) override;
98 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) 98 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE)
99 99
100 private: 100 private:
101 net::X509Certificate* SelectClientCertificateOnIOThread( 101 void SelectClientCertificateOnIOThread(
102 GURL requesting_url, 102 GURL requesting_url,
103 int render_process_id); 103 int render_process_id,
104 scoped_ptr<content::ClientCertificateDelegate> delegate);
104 105
105 #if !defined(OS_ANDROID) 106 #if !defined(OS_ANDROID)
106 // Returns the crash signal FD corresponding to the current process type. 107 // Returns the crash signal FD corresponding to the current process type.
107 int GetCrashSignalFD(const base::CommandLine& command_line); 108 int GetCrashSignalFD(const base::CommandLine& command_line);
108 109
109 // Creates a CrashHandlerHost instance for the given process type. 110 // Creates a CrashHandlerHost instance for the given process type.
110 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( 111 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
111 const std::string& process_type); 112 const std::string& process_type);
112 113
113 // A static cache to hold crash_handlers for each process_type 114 // A static cache to hold crash_handlers for each process_type
114 std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_; 115 std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_;
115 #endif 116 #endif
116 117
117 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; 118 scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
118 119
119 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); 120 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
120 }; 121 };
121 122
122 } // namespace shell 123 } // namespace shell
123 } // namespace chromecast 124 } // namespace chromecast
124 125
125 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 126 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chromecast/browser/cast_content_browser_client.cc » ('j') | chromecast/browser/cast_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698