chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4.

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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/content_settings/tab_specific_content_settings.h ('k') | chrome/browser/content_settings/tab_specific_content_settings_unittest.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/content_settings/tab_specific_content_settings.h"	5 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

6	6

7 #include <list>	7 #include <list>

8	8

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

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

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

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

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

	14 #include "build/build_config.h"

14 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"	15 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"

15 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"	16 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"

16 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"	17 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"

17 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"	18 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"

18 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"	19 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"

19 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"	20 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"

20 #include "chrome/browser/browsing_data/cookies_tree_model.h"	21 #include "chrome/browser/browsing_data/cookies_tree_model.h"

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

22 #include "chrome/browser/content_settings/chrome_content_settings_utils.h"	23 #include "chrome/browser/content_settings/chrome_content_settings_utils.h"

23 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"	24 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"

(...skipping 820 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
844 static_cast<MicrophoneCameraStateFlags>(	845 static_cast<MicrophoneCameraStateFlags>(

845 TabSpecificContentSettings::MICROPHONE_ACCESSED \|	846 TabSpecificContentSettings::MICROPHONE_ACCESSED \|

846 TabSpecificContentSettings::MICROPHONE_BLOCKED \|	847 TabSpecificContentSettings::MICROPHONE_BLOCKED \|

847 TabSpecificContentSettings::CAMERA_ACCESSED \|	848 TabSpecificContentSettings::CAMERA_ACCESSED \|

848 TabSpecificContentSettings::CAMERA_BLOCKED);	849 TabSpecificContentSettings::CAMERA_BLOCKED);

849 OnMediaStreamPermissionSet(	850 OnMediaStreamPermissionSet(

850 web_contents()->GetLastCommittedURL(),	851 web_contents()->GetLastCommittedURL(),

851 media_blocked,	852 media_blocked,

852 std::string(), std::string(), std::string(), std::string());	853 std::string(), std::string(), std::string(), std::string());

853 }	854 }

OLD	NEW