| OLD | NEW |
| 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 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 bool user_gesture, | 112 bool user_gesture, |
| 113 bool opener_suppressed, | 113 bool opener_suppressed, |
| 114 content::ResourceContext* context, | 114 content::ResourceContext* context, |
| 115 int render_process_id, | 115 int render_process_id, |
| 116 int opener_render_view_id, | 116 int opener_render_view_id, |
| 117 int opener_render_frame_id, | 117 int opener_render_frame_id, |
| 118 bool* no_javascript_access) override; | 118 bool* no_javascript_access) override; |
| 119 void GetAdditionalMappedFilesForChildProcess( | 119 void GetAdditionalMappedFilesForChildProcess( |
| 120 const base::CommandLine& command_line, | 120 const base::CommandLine& command_line, |
| 121 int child_process_id, | 121 int child_process_id, |
| 122 content::FileDescriptorInfo* mappings) override; | 122 FileDescriptorInfo* mappings |
| 123 #if defined(OS_ANDROID) |
| 124 , std::map<int, base::MemoryMappedFile::Region>* regions |
| 125 #endif |
| 126 ) override; |
| 123 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | 127 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 124 content::ExternalVideoSurfaceContainer* | 128 content::ExternalVideoSurfaceContainer* |
| 125 OverrideCreateExternalVideoSurfaceContainer( | 129 OverrideCreateExternalVideoSurfaceContainer( |
| 126 content::WebContents* web_contents) override; | 130 content::WebContents* web_contents) override; |
| 127 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | 131 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 128 | 132 |
| 129 protected: | 133 protected: |
| 130 CastContentBrowserClient(); | 134 CastContentBrowserClient(); |
| 131 | 135 |
| 132 private: | 136 private: |
| (...skipping 18 matching lines...) Expand all Loading... |
| 151 | 155 |
| 152 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; | 156 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; |
| 153 | 157 |
| 154 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 158 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
| 155 }; | 159 }; |
| 156 | 160 |
| 157 } // namespace shell | 161 } // namespace shell |
| 158 } // namespace chromecast | 162 } // namespace chromecast |
| 159 | 163 |
| 160 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 164 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |