chrome/browser/media_galleries/media_galleries_preferences.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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/media_galleries/media_galleries_dialog_controller.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 "base/base_paths_posix.h"	7 #include "base/base_paths_posix.h"

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

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

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

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

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

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

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

15 #include "base/strings/string_number_conversions.h"	15 #include "base/strings/string_number_conversions.h"

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

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

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

19 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_api.h"	19 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_api.h"

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

21 #include "chrome/browser/extensions/extension_system.h"	21 #include "chrome/browser/extensions/extension_system.h"

22 #include "chrome/browser/media_galleries/fileapi/iapps_finder.h"	22 #include "chrome/browser/media_galleries/fileapi/iapps_finder.h"

23 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"	23 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"

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

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

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

27 #include "chrome/browser/storage_monitor/media_storage_util.h"	27 #include "chrome/browser/storage_monitor/media_storage_util.h"

28 #include "chrome/browser/storage_monitor/storage_monitor.h"	28 #include "chrome/browser/storage_monitor/storage_monitor.h"

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

30 #include "chrome/common/extensions/extension.h"

31 #include "chrome/common/extensions/permissions/media_galleries_permission.h"	30 #include "chrome/common/extensions/permissions/media_galleries_permission.h"

32 #include "chrome/common/extensions/permissions/permissions_data.h"

33 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

34 #include "components/user_prefs/pref_registry_syncable.h"	32 #include "components/user_prefs/pref_registry_syncable.h"

35 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

	34 #include "extensions/common/extension.h"

36 #include "extensions/common/permissions/api_permission.h"	35 #include "extensions/common/permissions/api_permission.h"

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

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

38 #include "ui/base/l10n/l10n_util.h"	38 #include "ui/base/l10n/l10n_util.h"

39 #include "ui/base/text/bytes_formatting.h"	39 #include "ui/base/text/bytes_formatting.h"

40	40

41 using base::DictionaryValue;	41 using base::DictionaryValue;

42 using base::ListValue;	42 using base::ListValue;

43 using extensions::ExtensionPrefs;	43 using extensions::ExtensionPrefs;

44	44

45 namespace {	45 namespace {

46	46

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

1102 return extension_prefs_for_testing_;	1102 return extension_prefs_for_testing_;

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

1104 }	1104 }

1105	1105

1106 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(	1106 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(

1107 extensions::ExtensionPrefs* extension_prefs) {	1107 extensions::ExtensionPrefs* extension_prefs) {

1108 DCHECK(IsInitialized());	1108 DCHECK(IsInitialized());

1109 extension_prefs_for_testing_ = extension_prefs;	1109 extension_prefs_for_testing_ = extension_prefs;

1110 }	1110 }

OLD	NEW