chrome/browser/content_setting_bubble_model.cc - Issue 5367006: Refactor: move HostContentSettingsMap to content_settings

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_exceptions_table_model.cc ('k') | chrome/browser/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »

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/content_setting_bubble_model.h"	5 #include "chrome/browser/content_setting_bubble_model.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

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

10 #include "chrome/browser/blocked_content_container.h"	10 #include "chrome/browser/blocked_content_container.h"

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

11 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

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

13 #include "chrome/browser/metrics/user_metrics.h"	13 #include "chrome/browser/metrics/user_metrics.h"

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

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

16 #include "chrome/browser/renderer_host/render_view_host.h"	16 #include "chrome/browser/renderer_host/render_view_host.h"

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

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

19 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"	19 #include "chrome/browser/tab_contents/tab_specific_content_settings.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

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

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

(...skipping 466 matching lines...) Loading...
489 bubble_content_.resource_identifiers.insert(resource_identifier);	489 bubble_content_.resource_identifiers.insert(resource_identifier);

490 }	490 }

491	491

492 void ContentSettingBubbleModel::Observe(NotificationType type,	492 void ContentSettingBubbleModel::Observe(NotificationType type,

493 const NotificationSource& source,	493 const NotificationSource& source,

494 const NotificationDetails& details) {	494 const NotificationDetails& details) {

495 DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);	495 DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);

496 DCHECK(source == Source<TabContents>(tab_contents_));	496 DCHECK(source == Source<TabContents>(tab_contents_));

497 tab_contents_ = NULL;	497 tab_contents_ = NULL;

498 }	498 }

OLD	NEW