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

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

Issue 1164483003: Allow startup with missing V8 snapshot file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add natives_fd_exists and snapshot_fd_exists instead of checking for -1 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 // Set of origins that can get a handle for FileIO from NaCl. 297 // Set of origins that can get a handle for FileIO from NaCl.
298 std::set<std::string> allowed_file_handle_origins_; 298 std::set<std::string> allowed_file_handle_origins_;
299 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 299 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
300 // versions of Chrome. 300 // versions of Chrome.
301 std::set<std::string> allowed_dev_channel_origins_; 301 std::set<std::string> allowed_dev_channel_origins_;
302 #endif 302 #endif
303 303
304 #if defined(OS_POSIX) && !defined(OS_MACOSX) 304 #if defined(OS_POSIX) && !defined(OS_MACOSX)
305 base::ScopedFD v8_natives_fd_; 305 base::ScopedFD v8_natives_fd_;
306 base::ScopedFD v8_snapshot_fd_; 306 base::ScopedFD v8_snapshot_fd_;
307 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
308 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
307 #endif // OS_POSIX && !OS_MACOSX 309 #endif // OS_POSIX && !OS_MACOSX
308 310
309 // Vector of additional ChromeContentBrowserClientParts. 311 // Vector of additional ChromeContentBrowserClientParts.
310 // Parts are deleted in the reverse order they are added. 312 // Parts are deleted in the reverse order they are added.
311 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 313 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
312 314
313 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 315 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
314 316
315 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 317 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
316 }; 318 };
317 319
318 } // namespace chrome 320 } // namespace chrome
319 321
320 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 322 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698