chrome/browser/media_galleries/media_galleries_preferences.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/media_galleries/media_galleries_preferences.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/media_galleries/media_file_system_registry.cc ('k') | chrome/browser/media_galleries/media_galleries_preferences_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/media_galleries/media_galleries_preferences.h"	5 #include "chrome/browser/media_galleries/media_galleries_preferences.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

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

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

11 #include "base/i18n/time_formatting.h"	11 #include "base/i18n/time_formatting.h"

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

13 #include "base/path_service.h"	13 #include "base/path_service.h"

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

15 #include "base/prefs/scoped_user_pref_update.h"

16 #include "base/stl_util.h"	14 #include "base/stl_util.h"

17 #include "base/strings/string16.h"	15 #include "base/strings/string16.h"

18 #include "base/strings/string_number_conversions.h"	16 #include "base/strings/string_number_conversions.h"

19 #include "base/strings/utf_string_conversions.h"	17 #include "base/strings/utf_string_conversions.h"

20 #include "base/values.h"	18 #include "base/values.h"

21 #include "build/build_config.h"	19 #include "build/build_config.h"

22 #include "chrome/browser/browser_process.h"	20 #include "chrome/browser/browser_process.h"

23 #include "chrome/browser/media_galleries/fileapi/iapps_finder.h"	21 #include "chrome/browser/media_galleries/fileapi/iapps_finder.h"

24 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"	22 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"

25 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"	23 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"

26 #include "chrome/browser/media_galleries/media_file_system_registry.h"	24 #include "chrome/browser/media_galleries/media_file_system_registry.h"

27 #include "chrome/browser/media_galleries/media_galleries_histograms.h"	25 #include "chrome/browser/media_galleries/media_galleries_histograms.h"

28 #include "chrome/browser/profiles/profile.h"	26 #include "chrome/browser/profiles/profile.h"

29 #include "chrome/common/chrome_paths.h"	27 #include "chrome/common/chrome_paths.h"

30 #include "chrome/common/pref_names.h"	28 #include "chrome/common/pref_names.h"

31 #include "chrome/grit/generated_resources.h"	29 #include "chrome/grit/generated_resources.h"

32 #include "components/crx_file/id_util.h"	30 #include "components/crx_file/id_util.h"

33 #include "components/pref_registry/pref_registry_syncable.h"	31 #include "components/pref_registry/pref_registry_syncable.h"

	32 #include "components/prefs/pref_service.h"

	33 #include "components/prefs/scoped_user_pref_update.h"

34 #include "components/storage_monitor/media_storage_util.h"	34 #include "components/storage_monitor/media_storage_util.h"

35 #include "components/storage_monitor/storage_monitor.h"	35 #include "components/storage_monitor/storage_monitor.h"

36 #include "content/public/browser/browser_thread.h"	36 #include "content/public/browser/browser_thread.h"

37 #include "extensions/browser/extension_prefs.h"	37 #include "extensions/browser/extension_prefs.h"

38 #include "extensions/browser/extension_registry.h"	38 #include "extensions/browser/extension_registry.h"

39 #include "extensions/browser/pref_names.h"	39 #include "extensions/browser/pref_names.h"

40 #include "extensions/common/extension_set.h"	40 #include "extensions/common/extension_set.h"

41 #include "extensions/common/permissions/api_permission.h"	41 #include "extensions/common/permissions/api_permission.h"

42 #include "extensions/common/permissions/media_galleries_permission.h"	42 #include "extensions/common/permissions/media_galleries_permission.h"

43 #include "extensions/common/permissions/permissions_data.h"	43 #include "extensions/common/permissions/permissions_data.h"

(...skipping 1406 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1450 if (extension_prefs_for_testing_)	1450 if (extension_prefs_for_testing_)

1451 return extension_prefs_for_testing_;	1451 return extension_prefs_for_testing_;

1452 return extensions::ExtensionPrefs::Get(profile_);	1452 return extensions::ExtensionPrefs::Get(profile_);

1453 }	1453 }

1454	1454

1455 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(	1455 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(

1456 extensions::ExtensionPrefs* extension_prefs) {	1456 extensions::ExtensionPrefs* extension_prefs) {

1457 DCHECK(IsInitialized());	1457 DCHECK(IsInitialized());

1458 extension_prefs_for_testing_ = extension_prefs;	1458 extension_prefs_for_testing_ = extension_prefs;

1459 }	1459 }

OLD	NEW