| OLD | NEW |
| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
| 24 #include "chrome/common/icon_messages.h" | 24 #include "chrome/common/icon_messages.h" |
| 25 #include "chrome/common/render_messages.h" | 25 #include "chrome/common/render_messages.h" |
| 26 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
| 27 #include "content/browser/in_process_webkit/session_storage_namespace.h" | 27 #include "content/browser/in_process_webkit/session_storage_namespace.h" |
| 28 #include "content/browser/renderer_host/render_view_host.h" | 28 #include "content/browser/renderer_host/render_view_host.h" |
| 29 #include "content/browser/renderer_host/resource_request_details.h" | 29 #include "content/browser/renderer_host/resource_request_details.h" |
| 30 #include "content/browser/tab_contents/tab_contents_delegate.h" | 30 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 31 #include "content/browser/tab_contents/tab_contents_view.h" | 31 #include "content/browser/tab_contents/tab_contents_view.h" |
| 32 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
| 33 #include "content/common/view_messages.h" | |
| 34 #include "ui/gfx/rect.h" | 33 #include "ui/gfx/rect.h" |
| 35 | 34 |
| 36 #if defined(OS_MACOSX) | 35 #if defined(OS_MACOSX) |
| 37 #include "content/browser/mach_broker_mac.h" | 36 #include "content/browser/mach_broker_mac.h" |
| 38 #endif | 37 #endif |
| 39 | 38 |
| 40 namespace prerender { | 39 namespace prerender { |
| 41 | 40 |
| 42 namespace { | 41 namespace { |
| 43 | 42 |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 bool PrerenderContents::IsCrossSiteNavigationPending() const { | 676 bool PrerenderContents::IsCrossSiteNavigationPending() const { |
| 678 if (!prerender_contents_.get() || !prerender_contents_->tab_contents()) | 677 if (!prerender_contents_.get() || !prerender_contents_->tab_contents()) |
| 679 return false; | 678 return false; |
| 680 const TabContents* tab_contents = prerender_contents_->tab_contents(); | 679 const TabContents* tab_contents = prerender_contents_->tab_contents(); |
| 681 return (tab_contents->GetSiteInstance() != | 680 return (tab_contents->GetSiteInstance() != |
| 682 tab_contents->GetPendingSiteInstance()); | 681 tab_contents->GetPendingSiteInstance()); |
| 683 } | 682 } |
| 684 | 683 |
| 685 | 684 |
| 686 } // namespace prerender | 685 } // namespace prerender |
| OLD | NEW |