summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pepper_flash_settings_manager.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 06:17:34 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 06:17:34 +0000
commit443e93170c8d4db335384b340571fd3cb9c3bbb7 (patch)
treea3a48f898d87d24530b57888b7244806118d8337 /chrome/browser/pepper_flash_settings_manager.h
parentb713132324bcb1c387fafacef68f6b275931551b (diff)
downloadchromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.zip
chromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.tar.gz
chromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.tar.bz2
components: Move PrefRegistrySyncable into user_prefs namespace.
BUG=180785 R=joi@chromium.org TBR=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/14622003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pepper_flash_settings_manager.h')
-rw-r--r--chrome/browser/pepper_flash_settings_manager.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/pepper_flash_settings_manager.h b/chrome/browser/pepper_flash_settings_manager.h
index 8649bff8..3956ac3 100644
--- a/chrome/browser/pepper_flash_settings_manager.h
+++ b/chrome/browser/pepper_flash_settings_manager.h
@@ -12,13 +12,16 @@
#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
class PluginPrefs;
-class PrefRegistrySyncable;
class PrefService;
namespace content {
class BrowserContext;
}
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
namespace webkit {
struct WebPluginInfo;
}
@@ -63,7 +66,7 @@ class PepperFlashSettingsManager {
static bool IsPepperFlashInUse(PluginPrefs* plugin_prefs,
webkit::WebPluginInfo* plugin_info);
- static void RegisterUserPrefs(PrefRegistrySyncable* registry);
+ static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
// Requests to deauthorize content licenses.
// Client::OnDeauthorizeContentLicensesCompleted() will be called when the