content/browser/web_contents/navigation_controller_impl.cc - Issue 9960071: TabContents -> WebContentsImpl, part 3.

Side by Side Diff: content/browser/web_contents/navigation_controller_impl.cc

Issue 9960071: TabContents -> WebContentsImpl, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 8 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

« no previous file with comments | « content/browser/web_contents/navigation_controller_impl.h ('k') | content/browser/web_contents/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "content/browser/tab_contents/navigation_controller_impl.h"	5 #include "content/browser/web_contents/navigation_controller_impl.h"

6	6

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/string_number_conversions.h" // Temporary	9 #include "base/string_number_conversions.h" // Temporary

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "base/time.h"	11 #include "base/time.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

13 #include "content/browser/browser_url_handler_impl.h"	13 #include "content/browser/browser_url_handler_impl.h"

14 #include "content/browser/child_process_security_policy_impl.h"	14 #include "content/browser/child_process_security_policy_impl.h"

15 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"	15 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"

16 #include "content/browser/in_process_webkit/session_storage_namespace_impl.h"	16 #include "content/browser/in_process_webkit/session_storage_namespace_impl.h"

17 #include "content/browser/renderer_host/render_view_host_impl.h" // Temporary	17 #include "content/browser/renderer_host/render_view_host_impl.h" // Temporary

18 #include "content/browser/site_instance_impl.h"	18 #include "content/browser/site_instance_impl.h"

19 #include "content/browser/tab_contents/debug_urls.h"

20 #include "content/browser/tab_contents/interstitial_page_impl.h"

21 #include "content/browser/tab_contents/navigation_entry_impl.h"

22 #include "content/browser/tab_contents/tab_contents.h"	19 #include "content/browser/tab_contents/tab_contents.h"

	20 #include "content/browser/web_contents/debug_urls.h"

	21 #include "content/browser/web_contents/interstitial_page_impl.h"

	22 #include "content/browser/web_contents/navigation_entry_impl.h"

23 #include "content/common/view_messages.h"	23 #include "content/common/view_messages.h"

24 #include "content/public/browser/browser_context.h"	24 #include "content/public/browser/browser_context.h"

25 #include "content/public/browser/invalidate_type.h"	25 #include "content/public/browser/invalidate_type.h"

26 #include "content/public/browser/navigation_details.h"	26 #include "content/public/browser/navigation_details.h"

27 #include "content/public/browser/notification_service.h"	27 #include "content/public/browser/notification_service.h"

28 #include "content/public/browser/notification_types.h"	28 #include "content/public/browser/notification_types.h"

29 #include "content/public/browser/user_metrics.h"	29 #include "content/public/browser/user_metrics.h"

30 #include "content/public/browser/web_contents_delegate.h"	30 #include "content/public/browser/web_contents_delegate.h"

31 #include "content/public/common/content_constants.h"	31 #include "content/public/common/content_constants.h"

32 #include "net/base/escape.h"	32 #include "net/base/escape.h"

(...skipping 1399 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1432 for (int i = 0; i < max_index; i++) {	1432 for (int i = 0; i < max_index; i++) {

1433 // When cloning a tab, copy all entries except interstitial pages	1433 // When cloning a tab, copy all entries except interstitial pages

1434 if (source.entries_[i].get()->GetPageType() !=	1434 if (source.entries_[i].get()->GetPageType() !=

1435 content::PAGE_TYPE_INTERSTITIAL) {	1435 content::PAGE_TYPE_INTERSTITIAL) {

1436 entries_.insert(entries_.begin() + insert_index++,	1436 entries_.insert(entries_.begin() + insert_index++,

1437 linked_ptr<NavigationEntryImpl>(	1437 linked_ptr<NavigationEntryImpl>(

1438 new NavigationEntryImpl(*source.entries_[i])));	1438 new NavigationEntryImpl(*source.entries_[i])));

1439 }	1439 }

1440 }	1440 }

1441 }	1441 }

OLD	NEW