Chromium Code Reviews| 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" | |
| 12 #include "base/bind.h" | 11 #include "base/bind.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chrome/browser/chrome_notification_types.h" | 13 #include "chrome/browser/chrome_notification_types.h" |
| 15 #include "chrome/browser/history/history_tab_helper.h" | 14 #include "chrome/browser/history/history_tab_helper.h" |
| 16 #include "chrome/browser/history/history_types.h" | 15 #include "chrome/browser/history/history_types.h" |
| 17 #include "chrome/browser/prerender/prerender_field_trial.h" | 16 #include "chrome/browser/prerender/prerender_field_trial.h" |
| 18 #include "chrome/browser/prerender/prerender_final_status.h" | 17 #include "chrome/browser/prerender/prerender_final_status.h" |
| 19 #include "chrome/browser/prerender/prerender_handle.h" | 18 #include "chrome/browser/prerender/prerender_handle.h" |
| 20 #include "chrome/browser/prerender/prerender_manager.h" | 19 #include "chrome/browser/prerender/prerender_manager.h" |
| 21 #include "chrome/browser/prerender/prerender_manager_factory.h" | 20 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 22 #include "chrome/browser/prerender/prerender_resource_throttle.h" | 21 #include "chrome/browser/prerender/prerender_resource_throttle.h" |
| 23 #include "chrome/browser/prerender/prerender_tracker.h" | 22 #include "chrome/browser/prerender/prerender_tracker.h" |
| 24 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
| 25 #include "chrome/browser/ui/browser.h" | 24 #include "chrome/browser/ui/browser.h" |
| 26 #include "chrome/browser/ui/tab_helpers.h" | 25 #include "chrome/browser/ui/tab_helpers.h" |
| 26 #include "chrome/browser/ui/web_contents_sizer.h" | |
| 27 #include "chrome/common/prerender_messages.h" | 27 #include "chrome/common/prerender_messages.h" |
| 28 #include "chrome/common/render_messages.h" | 28 #include "chrome/common/render_messages.h" |
| 29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
| 30 #include "content/public/browser/browser_child_process_host.h" | 30 #include "content/public/browser/browser_child_process_host.h" |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
| 33 #include "content/public/browser/render_frame_host.h" | 33 #include "content/public/browser/render_frame_host.h" |
| 34 #include "content/public/browser/render_process_host.h" | 34 #include "content/public/browser/render_process_host.h" |
| 35 #include "content/public/browser/render_view_host.h" | 35 #include "content/public/browser/render_view_host.h" |
| 36 #include "content/public/browser/resource_request_details.h" | 36 #include "content/public/browser/resource_request_details.h" |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 326 | 326 |
| 327 alias_session_storage_namespace = session_storage_namespace->CreateAlias(); | 327 alias_session_storage_namespace = session_storage_namespace->CreateAlias(); |
| 328 prerender_contents_.reset( | 328 prerender_contents_.reset( |
| 329 CreateWebContents(alias_session_storage_namespace.get())); | 329 CreateWebContents(alias_session_storage_namespace.get())); |
| 330 TabHelpers::AttachTabHelpers(prerender_contents_.get()); | 330 TabHelpers::AttachTabHelpers(prerender_contents_.get()); |
| 331 content::WebContentsObserver::Observe(prerender_contents_.get()); | 331 content::WebContentsObserver::Observe(prerender_contents_.get()); |
| 332 | 332 |
| 333 web_contents_delegate_.reset(new WebContentsDelegateImpl(this)); | 333 web_contents_delegate_.reset(new WebContentsDelegateImpl(this)); |
| 334 prerender_contents_.get()->SetDelegate(web_contents_delegate_.get()); | 334 prerender_contents_.get()->SetDelegate(web_contents_delegate_.get()); |
| 335 // Set the size of the prerender WebContents. | 335 // Set the size of the prerender WebContents. |
| 336 apps::ResizeWebContents(prerender_contents_.get(), size_); | 336 chrome::ResizeWebContents(prerender_contents_.get(), size_); |
|
benwells
2014/08/26 08:33:34
I didn't think the chrome:: namespace was supposed
hashimoto
2014/08/26 08:48:57
Stopped using chrome namespace.
| |
| 337 | 337 |
| 338 child_id_ = GetRenderViewHost()->GetProcess()->GetID(); | 338 child_id_ = GetRenderViewHost()->GetProcess()->GetID(); |
| 339 route_id_ = GetRenderViewHost()->GetRoutingID(); | 339 route_id_ = GetRenderViewHost()->GetRoutingID(); |
| 340 | 340 |
| 341 // Log transactions to see if we could merge session storage namespaces in | 341 // Log transactions to see if we could merge session storage namespaces in |
| 342 // the event of a mismatch. | 342 // the event of a mismatch. |
| 343 alias_session_storage_namespace->AddTransactionLogProcessId(child_id_); | 343 alias_session_storage_namespace->AddTransactionLogProcessId(child_id_); |
| 344 | 344 |
| 345 // Add the RenderProcessHost to the Prerender Manager. | 345 // Add the RenderProcessHost to the Prerender Manager. |
| 346 prerender_manager()->AddPrerenderProcessHost( | 346 prerender_manager()->AddPrerenderProcessHost( |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 886 void PrerenderContents::AddResourceThrottle( | 886 void PrerenderContents::AddResourceThrottle( |
| 887 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { | 887 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { |
| 888 resource_throttles_.push_back(throttle); | 888 resource_throttles_.push_back(throttle); |
| 889 } | 889 } |
| 890 | 890 |
| 891 void PrerenderContents::AddNetworkBytes(int64 bytes) { | 891 void PrerenderContents::AddNetworkBytes(int64 bytes) { |
| 892 network_bytes_ += bytes; | 892 network_bytes_ += bytes; |
| 893 } | 893 } |
| 894 | 894 |
| 895 } // namespace prerender | 895 } // namespace prerender |
| OLD | NEW |