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

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: Fix misplaced ifdef for Windows 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const GURL& new_url) override; 105 const GURL& new_url) override;
106 bool ShouldSwapProcessesForRedirect( 106 bool ShouldSwapProcessesForRedirect(
107 content::ResourceContext* resource_context, 107 content::ResourceContext* resource_context,
108 const GURL& current_url, 108 const GURL& current_url,
109 const GURL& new_url) override; 109 const GURL& new_url) override;
110 bool ShouldAssignSiteForURL(const GURL& url) override; 110 bool ShouldAssignSiteForURL(const GURL& url) override;
111 std::string GetCanonicalEncodingNameByAliasName( 111 std::string GetCanonicalEncodingNameByAliasName(
112 const std::string& alias_name) override; 112 const std::string& alias_name) override;
113 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 113 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
114 int child_process_id) override; 114 int child_process_id) override;
115 void AppendMappedFileCommandLineSwitches(
116 base::CommandLine* command_line) override;
115 std::string GetApplicationLocale() override; 117 std::string GetApplicationLocale() override;
116 std::string GetAcceptLangs(content::BrowserContext* context) override; 118 std::string GetAcceptLangs(content::BrowserContext* context) override;
117 const gfx::ImageSkia* GetDefaultFavicon() override; 119 const gfx::ImageSkia* GetDefaultFavicon() override;
118 bool AllowAppCache(const GURL& manifest_url, 120 bool AllowAppCache(const GURL& manifest_url,
119 const GURL& first_party, 121 const GURL& first_party,
120 content::ResourceContext* context) override; 122 content::ResourceContext* context) override;
121 bool AllowServiceWorker(const GURL& scope, 123 bool AllowServiceWorker(const GURL& scope,
122 const GURL& first_party, 124 const GURL& first_party,
123 content::ResourceContext* context, 125 content::ResourceContext* context,
124 int render_process_id, 126 int render_process_id,
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 // Set of origins that can get a handle for FileIO from NaCl. 299 // Set of origins that can get a handle for FileIO from NaCl.
298 std::set<std::string> allowed_file_handle_origins_; 300 std::set<std::string> allowed_file_handle_origins_;
299 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 301 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
300 // versions of Chrome. 302 // versions of Chrome.
301 std::set<std::string> allowed_dev_channel_origins_; 303 std::set<std::string> allowed_dev_channel_origins_;
302 #endif 304 #endif
303 305
304 #if defined(OS_POSIX) && !defined(OS_MACOSX) 306 #if defined(OS_POSIX) && !defined(OS_MACOSX)
305 base::ScopedFD v8_natives_fd_; 307 base::ScopedFD v8_natives_fd_;
306 base::ScopedFD v8_snapshot_fd_; 308 base::ScopedFD v8_snapshot_fd_;
309 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
310 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
307 #endif // OS_POSIX && !OS_MACOSX 311 #endif // OS_POSIX && !OS_MACOSX
308 312
309 // Vector of additional ChromeContentBrowserClientParts. 313 // Vector of additional ChromeContentBrowserClientParts.
310 // Parts are deleted in the reverse order they are added. 314 // Parts are deleted in the reverse order they are added.
311 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 315 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
312 316
313 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 317 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
314 318
315 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 319 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
316 }; 320 };
317 321
318 } // namespace chrome 322 } // namespace chrome
319 323
320 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 324 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_content_browser_client.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698