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

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

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks
Patch Set: yfriedman review comments Created 5 years, 6 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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const content::Referrer& referrer, 109 const content::Referrer& referrer,
110 WindowOpenDisposition disposition, 110 WindowOpenDisposition disposition,
111 const blink::WebWindowFeatures& features, 111 const blink::WebWindowFeatures& features,
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 #if defined(OS_ANDROID)
120 void GetAdditionalMappedFilesForChildProcess(
121 const base::CommandLine& command_line,
122 int child_process_id,
123 content::FileDescriptorInfo* mappings,
124 std::map<int, base::MemoryMappedFile::Region>* regions) override;
125 #else
119 void GetAdditionalMappedFilesForChildProcess( 126 void GetAdditionalMappedFilesForChildProcess(
120 const base::CommandLine& command_line, 127 const base::CommandLine& command_line,
121 int child_process_id, 128 int child_process_id,
122 content::FileDescriptorInfo* mappings) override; 129 content::FileDescriptorInfo* mappings) override;
130 #endif // defined(OS_ANDROID)
123 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) 131 #if defined(OS_ANDROID) && defined(VIDEO_HOLE)
124 content::ExternalVideoSurfaceContainer* 132 content::ExternalVideoSurfaceContainer*
125 OverrideCreateExternalVideoSurfaceContainer( 133 OverrideCreateExternalVideoSurfaceContainer(
126 content::WebContents* web_contents) override; 134 content::WebContents* web_contents) override;
127 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) 135 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE)
128 136
129 protected: 137 protected:
130 CastContentBrowserClient(); 138 CastContentBrowserClient();
131 139
132 private: 140 private:
(...skipping 18 matching lines...) Expand all
151 159
152 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; 160 scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
153 161
154 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); 162 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
155 }; 163 };
156 164
157 } // namespace shell 165 } // namespace shell
158 } // namespace chromecast 166 } // namespace chromecast
159 167
160 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 168 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698