chrome/browser/media_galleries/media_galleries_preferences.cc - Issue 23717027: Media Galleries API Picasa: Move Picasa source files to correct location.

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

Issue 23717027: Media Galleries API Picasa: Move Picasa source files to correct location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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/media_galleries/imported_media_gallery_registry.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

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/i18n/time_formatting.h"	7 #include "base/i18n/time_formatting.h"

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

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

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

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

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

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

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

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

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

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

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

19 #include "chrome/browser/media_galleries/fileapi/itunes_finder.h"	19 #include "chrome/browser/media_galleries/fileapi/itunes_finder.h"

20 #include "chrome/browser/media_galleries/fileapi/picasa/picasa_finder.h"	20 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"

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

22 #include "chrome/browser/prefs/scoped_user_pref_update.h"	22 #include "chrome/browser/prefs/scoped_user_pref_update.h"

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

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

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

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

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

28 #include "chrome/common/extensions/permissions/api_permission.h"	28 #include "chrome/common/extensions/permissions/api_permission.h"

29 #include "chrome/common/extensions/permissions/media_galleries_permission.h"	29 #include "chrome/common/extensions/permissions/media_galleries_permission.h"

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

(...skipping 911 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
942 return extension_prefs_for_testing_;	942 return extension_prefs_for_testing_;

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

944 }	944 }

945	945

946 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(	946 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(

947 extensions::ExtensionPrefs* extension_prefs) {	947 extensions::ExtensionPrefs* extension_prefs) {

948 extension_prefs_for_testing_ = extension_prefs;	948 extension_prefs_for_testing_ = extension_prefs;

949 }	949 }

950	950

951 } // namespace chrome	951 } // namespace chrome

OLD	NEW