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

Side by Side Diff: content/browser/tab_contents/navigation_controller.cc

Issue 8921021: Trivial move of content::BrowserContext to content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 9 years 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/ssl/ssl_policy_backend.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/tab_contents/navigation_controller.h" 5 #include "content/browser/tab_contents/navigation_controller.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_context.h"
14 #include "content/browser/browser_url_handler.h" 13 #include "content/browser/browser_url_handler.h"
15 #include "content/browser/child_process_security_policy.h" 14 #include "content/browser/child_process_security_policy.h"
16 #include "content/browser/in_process_webkit/session_storage_namespace.h" 15 #include "content/browser/in_process_webkit/session_storage_namespace.h"
17 #include "content/browser/renderer_host/render_view_host.h" // Temporary 16 #include "content/browser/renderer_host/render_view_host.h" // Temporary
18 #include "content/browser/site_instance.h" 17 #include "content/browser/site_instance.h"
19 #include "content/browser/tab_contents/interstitial_page.h" 18 #include "content/browser/tab_contents/interstitial_page.h"
20 #include "content/browser/tab_contents/navigation_details.h" 19 #include "content/browser/tab_contents/navigation_details.h"
21 #include "content/browser/tab_contents/navigation_entry.h" 20 #include "content/browser/tab_contents/navigation_entry.h"
22 #include "content/browser/tab_contents/tab_contents.h" 21 #include "content/browser/tab_contents/tab_contents.h"
23 #include "content/browser/tab_contents/tab_contents_delegate.h" 22 #include "content/browser/tab_contents/tab_contents_delegate.h"
24 #include "content/common/view_messages.h" 23 #include "content/common/view_messages.h"
24 #include "content/public/browser/browser_context.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/browser/notification_types.h" 26 #include "content/public/browser/notification_types.h"
27 #include "content/public/browser/user_metrics.h" 27 #include "content/public/browser/user_metrics.h"
28 #include "content/public/common/content_constants.h" 28 #include "content/public/common/content_constants.h"
29 #include "net/base/escape.h" 29 #include "net/base/escape.h"
30 #include "net/base/mime_util.h" 30 #include "net/base/mime_util.h"
31 #include "net/base/net_util.h" 31 #include "net/base/net_util.h"
32 #include "webkit/glue/webkit_glue.h" 32 #include "webkit/glue/webkit_glue.h"
33 33
34 using content::UserMetricsAction; 34 using content::UserMetricsAction;
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 for (int i = 0; i < max_index; i++) { 1294 for (int i = 0; i < max_index; i++) {
1295 // When cloning a tab, copy all entries except interstitial pages 1295 // When cloning a tab, copy all entries except interstitial pages
1296 if (source.entries_[i].get()->page_type() != 1296 if (source.entries_[i].get()->page_type() !=
1297 content::PAGE_TYPE_INTERSTITIAL) { 1297 content::PAGE_TYPE_INTERSTITIAL) {
1298 entries_.insert(entries_.begin() + insert_index++, 1298 entries_.insert(entries_.begin() + insert_index++,
1299 linked_ptr<NavigationEntry>( 1299 linked_ptr<NavigationEntry>(
1300 new NavigationEntry(*source.entries_[i]))); 1300 new NavigationEntry(*source.entries_[i])));
1301 } 1301 }
1302 } 1302 }
1303 } 1303 }
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_policy_backend.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698