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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6625066: Add pending preloads indexed by routing id. Start preloading once we navigate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Responding to comments Created 9 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include "base/process_util.h" 7 #include "base/process_util.h"
8 #include "base/task.h" 8 #include "base/task.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/background_contents_service.h" 10 #include "chrome/browser/background_contents_service.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/prerender/prerender_final_status.h" 12 #include "chrome/browser/prerender/prerender_final_status.h"
13 #include "chrome/browser/prerender/prerender_manager.h" 13 #include "chrome/browser/prerender/prerender_manager.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/renderer_preferences_util.h" 15 #include "chrome/browser/renderer_preferences_util.h"
16 #include "chrome/browser/ui/login/login_prompt.h" 16 #include "chrome/browser/ui/login/login_prompt.h"
17 #include "chrome/common/extensions/extension_constants.h" 17 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/render_messages.h" 18 #include "chrome/common/render_messages.h"
19 #include "chrome/common/render_messages_params.h" 19 #include "chrome/common/render_messages_params.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "chrome/common/view_types.h" 21 #include "chrome/common/view_types.h"
22 #include "content/browser/browsing_instance.h" 22 #include "content/browser/browsing_instance.h"
23 #include "content/browser/renderer_host/resource_dispatcher_host.h"
cbentzel 2011/03/14 18:06:13 Is this needed?
dominich 2011/03/14 19:42:34 Merge issue that keeps coming back. Done.
23 #include "content/browser/renderer_host/render_view_host.h" 24 #include "content/browser/renderer_host/render_view_host.h"
24 #include "content/browser/renderer_host/resource_dispatcher_host.h" 25 #include "content/browser/renderer_host/resource_dispatcher_host.h"
25 #include "content/browser/site_instance.h" 26 #include "content/browser/site_instance.h"
26 #include "content/common/notification_service.h" 27 #include "content/common/notification_service.h"
27 #include "ui/gfx/rect.h" 28 #include "ui/gfx/rect.h"
28 29
29 #if defined(OS_MACOSX) 30 #if defined(OS_MACOSX)
30 #include "chrome/browser/mach_broker_mac.h" 31 #include "chrome/browser/mach_broker_mac.h"
31 #endif 32 #endif
32 33
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 return; 463 return;
463 464
464 size_t private_bytes, shared_bytes; 465 size_t private_bytes, shared_bytes;
465 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) { 466 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
466 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024) 467 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024)
467 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED); 468 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
468 } 469 }
469 } 470 }
470 471
471 } // namespace prerender 472 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698