chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« base/prefs/pref_notifier_impl.h ('K') | « chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm ('k') | chrome/browser/ui/gesture_prefs_observer_factory_aura.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 "chrome/browser/ui/content_settings/content_setting_bubble_model.h"	5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

6	6

	7 #include "base/prefs/pref_service.h"

7 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/api/infobars/infobar_service.h"	9 #include "chrome/browser/api/infobars/infobar_service.h"

9 #include "chrome/browser/content_settings/content_settings_utils.h"	10 #include "chrome/browser/content_settings/content_settings_utils.h"

10 #include "chrome/browser/content_settings/cookie_settings.h"	11 #include "chrome/browser/content_settings/cookie_settings.h"

11 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

12 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"	13 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"

13 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"	14 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

14 #include "chrome/browser/favicon/favicon_tab_helper.h"	15 #include "chrome/browser/favicon/favicon_tab_helper.h"

15 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"	16 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"

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

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"	18 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

19 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"	19 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"

20 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"	20 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"	21 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega te.h"

22 #include "chrome/browser/ui/content_settings/content_setting_changed_infobar_del egate.h"	22 #include "chrome/browser/ui/content_settings/content_setting_changed_infobar_del egate.h"

23 #include "chrome/common/chrome_notification_types.h"	23 #include "chrome/common/chrome_notification_types.h"

24 #include "chrome/common/content_settings.h"	24 #include "chrome/common/content_settings.h"

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

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

(...skipping 938 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
965 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {	965 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {

966 DCHECK_EQ(web_contents_,	966 DCHECK_EQ(web_contents_,

967 content::Source<WebContents>(source).ptr());	967 content::Source<WebContents>(source).ptr());

968 web_contents_ = NULL;	968 web_contents_ = NULL;

969 } else {	969 } else {

970 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);	970 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);

971 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());	971 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());

972 profile_ = NULL;	972 profile_ = NULL;

973 }	973 }

974 }	974 }

OLD	NEW