chrome/browser/browser_prefs.cc - Issue 594030: Fixes bad merge to 249.

Side by Side Diff: chrome/browser/browser_prefs.cc

Issue 594030: Fixes bad merge to 249. (Closed) Base URL: svn://chrome-svn/chrome/branches/249/src/

Patch Set: Created 10 years, 10 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 | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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/browser_prefs.h"	5 #include "chrome/browser/browser_prefs.h"

6	6

7 #include "chrome/browser/bookmarks/bookmark_utils.h"	7 #include "chrome/browser/bookmarks/bookmark_utils.h"

8 #include "chrome/browser/browser.h"	8 #include "chrome/browser/browser.h"

9 #include "chrome/browser/browser_shutdown.h"	9 #include "chrome/browser/browser_shutdown.h"

10 #include "chrome/browser/debugger/devtools_manager.h"	10 #include "chrome/browser/debugger/devtools_manager.h"

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 SafeBrowsingService::RegisterPrefs(local_state);	65 SafeBrowsingService::RegisterPrefs(local_state);

66 browser_shutdown::RegisterPrefs(local_state);	66 browser_shutdown::RegisterPrefs(local_state);

67 chrome_browser_net::RegisterPrefs(local_state);	67 chrome_browser_net::RegisterPrefs(local_state);

68 bookmark_utils::RegisterPrefs(local_state);	68 bookmark_utils::RegisterPrefs(local_state);

69 PageInfoModel::RegisterPrefs(local_state);	69 PageInfoModel::RegisterPrefs(local_state);

70 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port	70 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port

71 BrowserView::RegisterBrowserViewPrefs(local_state);	71 BrowserView::RegisterBrowserViewPrefs(local_state);

72 #endif	72 #endif

73 #if defined(OS_WIN) \|\| defined(OS_LINUX)	73 #if defined(OS_WIN) \|\| defined(OS_LINUX)

74 TaskManager::RegisterPrefs(local_state);	74 TaskManager::RegisterPrefs(local_state);

	75 #endif

75 #if defined(OS_WIN)	76 #if defined(OS_WIN)

76 CookiePromptModalDialog::RegisterPrefs(local_state);	77 CookiePromptModalDialog::RegisterPrefs(local_state);

77 #endif	78 #endif

78 }

79	79

80 // User prefs	80 // User prefs

81 SessionStartupPref::RegisterUserPrefs(user_prefs);	81 SessionStartupPref::RegisterUserPrefs(user_prefs);

82 Browser::RegisterUserPrefs(user_prefs);	82 Browser::RegisterUserPrefs(user_prefs);

83 PasswordManager::RegisterUserPrefs(user_prefs);	83 PasswordManager::RegisterUserPrefs(user_prefs);

84 chrome_browser_net::RegisterUserPrefs(user_prefs);	84 chrome_browser_net::RegisterUserPrefs(user_prefs);

85 DownloadManager::RegisterUserPrefs(user_prefs);	85 DownloadManager::RegisterUserPrefs(user_prefs);

86 SSLManager::RegisterUserPrefs(user_prefs);	86 SSLManager::RegisterUserPrefs(user_prefs);

87 bookmark_utils::RegisterUserPrefs(user_prefs);	87 bookmark_utils::RegisterUserPrefs(user_prefs);

88 FormFieldHistoryManager::RegisterUserPrefs(user_prefs);	88 FormFieldHistoryManager::RegisterUserPrefs(user_prefs);

89 TabContents::RegisterUserPrefs(user_prefs);	89 TabContents::RegisterUserPrefs(user_prefs);

90 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);	90 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);

91 ExtensionDOMUI::RegisterUserPrefs(user_prefs);	91 ExtensionDOMUI::RegisterUserPrefs(user_prefs);

92 ExtensionsUI::RegisterUserPrefs(user_prefs);	92 ExtensionsUI::RegisterUserPrefs(user_prefs);

93 NewTabUI::RegisterUserPrefs(user_prefs);	93 NewTabUI::RegisterUserPrefs(user_prefs);

94 HostContentSettingsMap::RegisterUserPrefs(user_prefs);	94 HostContentSettingsMap::RegisterUserPrefs(user_prefs);

95 DevToolsManager::RegisterUserPrefs(user_prefs);	95 DevToolsManager::RegisterUserPrefs(user_prefs);

96 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port.	96 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port.

97 #if defined(OS_WIN)	97 #if defined(OS_WIN)

98 ContentSettingsWindowView::RegisterUserPrefs(user_prefs);	98 ContentSettingsWindowView::RegisterUserPrefs(user_prefs);

99 #endif	99 #endif

100 #endif	100 #endif

101 #if defined(TOOLKIT_GTK)	101 #if defined(TOOLKIT_GTK)

102 BrowserWindowGtk::RegisterUserPrefs(user_prefs);	102 BrowserWindowGtk::RegisterUserPrefs(user_prefs);

103 #endif	103 #endif

104 }	104 }

105	105

106 } // namespace browser	106 } // namespace browser

OLD	NEW