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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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 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, 4 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/cocoa/window_size_autosaver_unittest.mm ('k') | chrome/browser/cookie_modal_dialog.cc » ('j') | chrome/chrome_browser.gypi » ('J')

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_popup_container.h"	10 #include "chrome/browser/blocked_popup_container.h"

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

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

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

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

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

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

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

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

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

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

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

22 #include "grit/generated_resources.h"	22 #include "grit/generated_resources.h"

23 #include "net/base/net_util.h"	23 #include "net/base/net_util.h"

(...skipping 445 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
469 bubble_content_.resource_identifiers.insert(resource_identifier);	469 bubble_content_.resource_identifiers.insert(resource_identifier);

470 }	470 }

471	471

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

473 const NotificationSource& source,	473 const NotificationSource& source,

474 const NotificationDetails& details) {	474 const NotificationDetails& details) {

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

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

477 tab_contents_ = NULL;	477 tab_contents_ = NULL;

478 }	478 }

OLD	NEW