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

Side by Side Diff: ash/shell/content_client/shell_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: Reinstate asserts that the natives are passed to the renderer by fd 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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 30 matching lines...) Expand all
41 int child_process_id, 41 int child_process_id,
42 content::FileDescriptorInfo* mappings) override; 42 content::FileDescriptorInfo* mappings) override;
43 #endif 43 #endif
44 44
45 content::ShellBrowserContext* browser_context(); 45 content::ShellBrowserContext* browser_context();
46 46
47 private: 47 private:
48 #if defined(OS_POSIX) && !defined(OS_MACOSX) 48 #if defined(OS_POSIX) && !defined(OS_MACOSX)
49 base::ScopedFD v8_natives_fd_; 49 base::ScopedFD v8_natives_fd_;
50 base::ScopedFD v8_snapshot_fd_; 50 base::ScopedFD v8_snapshot_fd_;
51 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
sky 2015/06/04 19:36:42 fields than members. Also, can't you use v8_native
Erik Corry Chromium.org 2015/06/05 13:15:16 Done.
52 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
51 #endif 53 #endif
52 54
53 ShellBrowserMainParts* shell_browser_main_parts_; 55 ShellBrowserMainParts* shell_browser_main_parts_;
54 56
55 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 57 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
56 }; 58 };
57 59
58 } // namespace shell 60 } // namespace shell
59 } // namespace ash 61 } // namespace ash
60 62
61 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 63 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698