chrome/browser/media_galleries/media_galleries_preferences.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, 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/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/path_service.h"	7 #include "base/path_service.h"

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

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

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

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

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

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

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

15 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.h"	15 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_st ate_tracker.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_prefs.h"	17 #include "chrome/browser/extensions/extension_prefs.h"

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

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

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

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

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

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

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

828 }	828 }

829	829

830 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(	830 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(

831 extensions::ExtensionPrefs* extension_prefs) {	831 extensions::ExtensionPrefs* extension_prefs) {

832 extension_prefs_for_testing_ = extension_prefs;	832 extension_prefs_for_testing_ = extension_prefs;

833 }	833 }

834	834

835 } // namespace chrome	835 } // namespace chrome

OLD	NEW