OLD | NEW |
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 #include "chrome/browser/prerender/prerender_contents.h" | 5 #include "chrome/browser/prerender/prerender_contents.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
| 11 #include "apps/ui/web_contents_sizer.h" |
11 #include "base/bind.h" | 12 #include "base/bind.h" |
12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
13 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
14 #include "chrome/browser/history/history_tab_helper.h" | 15 #include "chrome/browser/history/history_tab_helper.h" |
15 #include "chrome/browser/history/history_types.h" | 16 #include "chrome/browser/history/history_types.h" |
16 #include "chrome/browser/prerender/prerender_field_trial.h" | 17 #include "chrome/browser/prerender/prerender_field_trial.h" |
17 #include "chrome/browser/prerender/prerender_final_status.h" | 18 #include "chrome/browser/prerender/prerender_final_status.h" |
18 #include "chrome/browser/prerender/prerender_handle.h" | 19 #include "chrome/browser/prerender/prerender_handle.h" |
19 #include "chrome/browser/prerender/prerender_manager.h" | 20 #include "chrome/browser/prerender/prerender_manager.h" |
20 #include "chrome/browser/prerender/prerender_manager_factory.h" | 21 #include "chrome/browser/prerender/prerender_manager_factory.h" |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 | 321 |
321 alias_session_storage_namespace = session_storage_namespace->CreateAlias(); | 322 alias_session_storage_namespace = session_storage_namespace->CreateAlias(); |
322 prerender_contents_.reset( | 323 prerender_contents_.reset( |
323 CreateWebContents(alias_session_storage_namespace.get())); | 324 CreateWebContents(alias_session_storage_namespace.get())); |
324 TabHelpers::AttachTabHelpers(prerender_contents_.get()); | 325 TabHelpers::AttachTabHelpers(prerender_contents_.get()); |
325 content::WebContentsObserver::Observe(prerender_contents_.get()); | 326 content::WebContentsObserver::Observe(prerender_contents_.get()); |
326 | 327 |
327 web_contents_delegate_.reset(new WebContentsDelegateImpl(this)); | 328 web_contents_delegate_.reset(new WebContentsDelegateImpl(this)); |
328 prerender_contents_.get()->SetDelegate(web_contents_delegate_.get()); | 329 prerender_contents_.get()->SetDelegate(web_contents_delegate_.get()); |
329 // Set the size of the prerender WebContents. | 330 // Set the size of the prerender WebContents. |
330 prerender_contents_->GetView()->SizeContents(size_); | 331 apps::ResizeWebContents(prerender_contents_.get(), size_); |
331 | 332 |
332 child_id_ = GetRenderViewHost()->GetProcess()->GetID(); | 333 child_id_ = GetRenderViewHost()->GetProcess()->GetID(); |
333 route_id_ = GetRenderViewHost()->GetRoutingID(); | 334 route_id_ = GetRenderViewHost()->GetRoutingID(); |
334 | 335 |
335 // Log transactions to see if we could merge session storage namespaces in | 336 // Log transactions to see if we could merge session storage namespaces in |
336 // the event of a mismatch. | 337 // the event of a mismatch. |
337 alias_session_storage_namespace->AddTransactionLogProcessId(child_id_); | 338 alias_session_storage_namespace->AddTransactionLogProcessId(child_id_); |
338 | 339 |
339 NotifyPrerenderStart(); | 340 NotifyPrerenderStart(); |
340 | 341 |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
875 void PrerenderContents::AddResourceThrottle( | 876 void PrerenderContents::AddResourceThrottle( |
876 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { | 877 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { |
877 resource_throttles_.push_back(throttle); | 878 resource_throttles_.push_back(throttle); |
878 } | 879 } |
879 | 880 |
880 void PrerenderContents::AddNetworkBytes(int64 bytes) { | 881 void PrerenderContents::AddNetworkBytes(int64 bytes) { |
881 network_bytes_ += bytes; | 882 network_bytes_ += bytes; |
882 } | 883 } |
883 | 884 |
884 } // namespace prerender | 885 } // namespace prerender |
OLD | NEW |