| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 const blink::WebWindowFeatures& features, | 93 const blink::WebWindowFeatures& features, |
| 94 bool user_gesture, | 94 bool user_gesture, |
| 95 bool opener_suppressed, | 95 bool opener_suppressed, |
| 96 content::ResourceContext* context, | 96 content::ResourceContext* context, |
| 97 int render_process_id, | 97 int render_process_id, |
| 98 int opener_id, | 98 int opener_id, |
| 99 bool* no_javascript_access) override; | 99 bool* no_javascript_access) override; |
| 100 void GetAdditionalMappedFilesForChildProcess( | 100 void GetAdditionalMappedFilesForChildProcess( |
| 101 const base::CommandLine& command_line, | 101 const base::CommandLine& command_line, |
| 102 int child_process_id, | 102 int child_process_id, |
| 103 content::FileDescriptorInfo* mappings) override; | 103 content::FileDescriptorInfo* mappings |
| 104 #if defined(OS_ANDROID) |
| 105 , |
| 106 std::map<int, base::MemoryMappedFile::Region>* regions |
| 107 #endif |
| 108 ) override; |
| 104 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | 109 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 105 content::ExternalVideoSurfaceContainer* | 110 content::ExternalVideoSurfaceContainer* |
| 106 OverrideCreateExternalVideoSurfaceContainer( | 111 OverrideCreateExternalVideoSurfaceContainer( |
| 107 content::WebContents* web_contents) override; | 112 content::WebContents* web_contents) override; |
| 108 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | 113 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 109 | 114 |
| 110 private: | 115 private: |
| 111 void AddNetworkHintsMessageFilter(int render_process_id, | 116 void AddNetworkHintsMessageFilter(int render_process_id, |
| 112 net::URLRequestContext* context); | 117 net::URLRequestContext* context); |
| 113 | 118 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 134 | 139 |
| 135 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; | 140 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; |
| 136 | 141 |
| 137 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 142 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
| 138 }; | 143 }; |
| 139 | 144 |
| 140 } // namespace shell | 145 } // namespace shell |
| 141 } // namespace chromecast | 146 } // namespace chromecast |
| 142 | 147 |
| 143 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 148 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |