chrome/browser/prefs/browser_prefs.cc - Issue 3299020: Remove vestigial cookie/web app permissions prompting UI now that the async U...

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

Issue 3299020: Remove vestigial cookie/web app permissions prompting UI now that the async U... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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 | Annotate | Revision Log

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

6	6

7 #include "chrome/browser/autofill/autofill_manager.h"	7 #include "chrome/browser/autofill/autofill_manager.h"

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

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

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

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

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

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

14 #include "chrome/browser/debugger/devtools_manager.h"	13 #include "chrome/browser/debugger/devtools_manager.h"

15 #include "chrome/browser/dom_ui/labs_ui.h"	14 #include "chrome/browser/dom_ui/labs_ui.h"

16 #include "chrome/browser/dom_ui/new_tab_ui.h"	15 #include "chrome/browser/dom_ui/new_tab_ui.h"

17 #include "chrome/browser/dom_ui/plugins_ui.h"	16 #include "chrome/browser/dom_ui/plugins_ui.h"

18 #include "chrome/browser/download/download_prefs.h"	17 #include "chrome/browser/download/download_prefs.h"

19 #include "chrome/browser/extensions/extension_dom_ui.h"	18 #include "chrome/browser/extensions/extension_dom_ui.h"

20 #include "chrome/browser/extensions/extension_prefs.h"	19 #include "chrome/browser/extensions/extension_prefs.h"

21 #include "chrome/browser/extensions/extensions_ui.h"	20 #include "chrome/browser/extensions/extensions_ui.h"

22 #include "chrome/browser/external_protocol_handler.h"	21 #include "chrome/browser/external_protocol_handler.h"

23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
132 #if defined(TOOLKIT_VIEWS)	131 #if defined(TOOLKIT_VIEWS)

133 BrowserActionsContainer::RegisterUserPrefs(user_prefs);	132 BrowserActionsContainer::RegisterUserPrefs(user_prefs);

134 #elif defined(TOOLKIT_GTK)	133 #elif defined(TOOLKIT_GTK)

135 BrowserWindowGtk::RegisterUserPrefs(user_prefs);	134 BrowserWindowGtk::RegisterUserPrefs(user_prefs);

136 certificate_manager_util::RegisterUserPrefs(user_prefs);	135 certificate_manager_util::RegisterUserPrefs(user_prefs);

137 #endif	136 #endif

138 #if defined(OS_CHROMEOS)	137 #if defined(OS_CHROMEOS)

139 chromeos::Preferences::RegisterUserPrefs(user_prefs);	138 chromeos::Preferences::RegisterUserPrefs(user_prefs);

140 #endif	139 #endif

141 BackgroundContentsService::RegisterUserPrefs(user_prefs);	140 BackgroundContentsService::RegisterUserPrefs(user_prefs);

142 CookiePromptModalDialog::RegisterUserPrefs(user_prefs);

143 SigninManager::RegisterUserPrefs(user_prefs);	141 SigninManager::RegisterUserPrefs(user_prefs);

144 }	142 }

145	143

146 } // namespace browser	144 } // namespace browser

OLD	NEW