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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 1187433006: Load language .pak files directly from the apk when using splits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@locale-res-or-file
Patch Set: 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 bool allow); 294 bool allow);
295 295
296 static void RequestFileSystemPermissionOnUIThread( 296 static void RequestFileSystemPermissionOnUIThread(
297 int render_process_id, 297 int render_process_id,
298 int render_frame_id, 298 int render_frame_id,
299 const GURL& url, 299 const GURL& url,
300 bool allowed_by_default, 300 bool allowed_by_default,
301 const base::Callback<void(bool)>& callback); 301 const base::Callback<void(bool)>& callback);
302 #endif 302 #endif
303 303
304 #if defined(OS_ANDROID)
305 base::ScopedFD locale_pak_fd_;
306 base::MemoryMappedFile::Region locale_pak_region_;
307 #endif
304 #if defined(ENABLE_PLUGINS) 308 #if defined(ENABLE_PLUGINS)
305 // Set of origins that can use TCP/UDP private APIs from NaCl. 309 // Set of origins that can use TCP/UDP private APIs from NaCl.
306 std::set<std::string> allowed_socket_origins_; 310 std::set<std::string> allowed_socket_origins_;
307 // Set of origins that can get a handle for FileIO from NaCl. 311 // Set of origins that can get a handle for FileIO from NaCl.
308 std::set<std::string> allowed_file_handle_origins_; 312 std::set<std::string> allowed_file_handle_origins_;
309 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 313 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
310 // versions of Chrome. 314 // versions of Chrome.
311 std::set<std::string> allowed_dev_channel_origins_; 315 std::set<std::string> allowed_dev_channel_origins_;
312 #endif 316 #endif
313 317
314 // Vector of additional ChromeContentBrowserClientParts. 318 // Vector of additional ChromeContentBrowserClientParts.
315 // Parts are deleted in the reverse order they are added. 319 // Parts are deleted in the reverse order they are added.
316 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 320 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
317 321
318 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 322 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
319 323
320 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 324 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
321 }; 325 };
322 326
323 } // namespace chrome 327 } // namespace chrome
324 328
325 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 329 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698