chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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/ui/webui/options/content_settings_handler.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | « chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc ('k') | chrome/browser/ui/webui/options/cookies_view_handler.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/webui/options/content_settings_handler.h"	5 #include "chrome/browser/ui/webui/options/content_settings_handler.h"

6	6

7 #include <map>	7 #include <map>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

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

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

14 #include "base/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

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

17 #include "chrome/browser/content_settings/content_settings_details.h"	17 #include "chrome/browser/content_settings/content_settings_details.h"

18 #include "chrome/browser/content_settings/content_settings_utils.h"	18 #include "chrome/browser/content_settings/content_settings_utils.h"

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

20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"	20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"

21 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"	21 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

22 #include "chrome/browser/extensions/extension_service.h"	22 #include "chrome/browser/extensions/extension_service.h"

23 #include "chrome/browser/extensions/extension_special_storage_policy.h"	23 #include "chrome/browser/extensions/extension_special_storage_policy.h"

24 #include "chrome/browser/google/google_util.h"	24 #include "chrome/browser/google/google_util.h"

(...skipping 1360 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1385 media_settings_.flash_default_setting,	1385 media_settings_.flash_default_setting,

1386 media_settings_.flash_exceptions,	1386 media_settings_.flash_exceptions,

1387 media_settings_.policy_disable_audio,	1387 media_settings_.policy_disable_audio,

1388 media_settings_.policy_disable_video)) {	1388 media_settings_.policy_disable_video)) {

1389 ShowFlashMediaLink(EXCEPTIONS, true);	1389 ShowFlashMediaLink(EXCEPTIONS, true);

1390 }	1390 }

1391 }	1391 }

1392 }	1392 }

1393	1393

1394 } // namespace options	1394 } // namespace options

OLD	NEW