chrome/browser/tab_contents/navigation_controller.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

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

« no previous file with comments | « chrome/browser/sync/sync_setup_wizard_unittest.cc ('k') | chrome/browser/tab_contents/navigation_entry.cc » ('j') | chrome/chrome_browser.gypi » ('J')

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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/tab_contents/navigation_controller.h"	5 #include "chrome/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_util.h"	9 #include "base/string_util.h"

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

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

12 #include "chrome/browser/browser_about_handler.h"	12 #include "chrome/browser/browser_about_handler.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/browser_url_handler.h"	14 #include "chrome/browser/browser_url_handler.h"

15 #include "chrome/browser/in_process_webkit/dom_storage_context.h"	15 #include "chrome/browser/in_process_webkit/dom_storage_context.h"

16 #include "chrome/browser/in_process_webkit/webkit_context.h"	16 #include "chrome/browser/in_process_webkit/webkit_context.h"

17 #include "chrome/browser/pref_service.h"	17 #include "chrome/browser/prefs/pref_service.h"

18 #include "chrome/browser/profile.h"	18 #include "chrome/browser/profile.h"

19 #include "chrome/browser/renderer_host/site_instance.h"	19 #include "chrome/browser/renderer_host/site_instance.h"

20 #include "chrome/browser/sessions/session_types.h"	20 #include "chrome/browser/sessions/session_types.h"

21 #include "chrome/browser/tab_contents/interstitial_page.h"	21 #include "chrome/browser/tab_contents/interstitial_page.h"

22 #include "chrome/browser/tab_contents/navigation_entry.h"	22 #include "chrome/browser/tab_contents/navigation_entry.h"

23 #include "chrome/browser/tab_contents/tab_contents.h"	23 #include "chrome/browser/tab_contents/tab_contents.h"

24 #include "chrome/browser/tab_contents/tab_contents_delegate.h"	24 #include "chrome/browser/tab_contents/tab_contents_delegate.h"

25 #include "chrome/common/chrome_constants.h"	25 #include "chrome/common/chrome_constants.h"

26 #include "chrome/common/navigation_types.h"	26 #include "chrome/common/navigation_types.h"

27 #include "chrome/common/notification_service.h"	27 #include "chrome/common/notification_service.h"

(...skipping 1082 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1110 return i;	1110 return i;

1111 }	1111 }

1112 return -1;	1112 return -1;

1113 }	1113 }

1114	1114

1115 NavigationEntry* NavigationController::GetTransientEntry() const {	1115 NavigationEntry* NavigationController::GetTransientEntry() const {

1116 if (transient_entry_index_ == -1)	1116 if (transient_entry_index_ == -1)

1117 return NULL;	1117 return NULL;

1118 return entries_[transient_entry_index_].get();	1118 return entries_[transient_entry_index_].get();

1119 }	1119 }

OLD	NEW