Merge apps/pref* to extensions/browser/pref*

The pref's exclusive user AppWindow will move to extensions/browser

Merge apps/pref_names.{cc,h} to extensions/browser/pref_names.{cc,h}
Merge apps/prefs.{cc,h} to extensions/browser/extension_prefs.cc

BUG=403726
TBR=bartfab@chromium.org for include fix in configuration_policy_handler_list_factory.cc.

Review URL: https://codereview.chromium.org/493003002

Cr-Commit-Position: refs/heads/master@{#291650}

6 files changed, 2 insertions, 83 deletions

diff --git a/apps/app_window.cc b/apps/app_window.cc
index 14bf438..459e4c49 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -49,8 +49,8 @@
 #include "ui/gfx/screen.h"
 
 #if !defined(OS_MACOSX)
-#include "apps/pref_names.h"
 #include "base/prefs/pref_service.h"
+#include "extensions/browser/pref_names.h"
 #endif
 
 using content::BrowserContext;
@@ -593,7 +593,7 @@ void AppWindow::SetFullscreen(FullscreenType type, bool enable) {
       PrefService* prefs =
           extensions::ExtensionsBrowserClient::Get()->GetPrefServiceForContext(
               browser_context());
-      if (!prefs->GetBoolean(prefs::kAppFullscreenAllowed))
+      if (!prefs->GetBoolean(extensions::pref_names::kAppFullscreenAllowed))
         return;
     }
 #endif
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 608b919..5337780 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -51,10 +51,6 @@
         'launcher.cc',
         'launcher.h',
         'metrics_names.h',
-        'pref_names.cc',
-        'pref_names.h',
-        'prefs.cc',
-        'prefs.h',
         'saved_files_service.cc',
         'saved_files_service.h',
         'saved_files_service_factory.cc',
diff --git a/apps/pref_names.cc b/apps/pref_names.cc
deleted file mode 100644
index ea08c76..0000000
--- a/apps/pref_names.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "apps/pref_names.h"
-
-namespace apps {
-
-namespace prefs {
-
-// A boolean that tracks whether apps are allowed to enter fullscreen mode.
-extern const char kAppFullscreenAllowed[] =
-    "apps.fullscreen.allowed";
-
-}  // namespace prefs
-
-}  // namespace apps
diff --git a/apps/pref_names.h b/apps/pref_names.h
deleted file mode 100644
index 764be82..0000000
--- a/apps/pref_names.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef APPS_PREF_NAMES_H_
-#define APPS_PREF_NAMES_H_
-
-namespace apps {
-namespace prefs {
-
-// Alphabetical list of preference names specific to Apps component.
-// Keep alphabetized and document each one in the source file.
-extern const char kAppFullscreenAllowed[];
-
-}  // namespace prefs
-}  // namespace apps
-
-#endif  // APPS_PREF_NAMES_H_
diff --git a/apps/prefs.cc b/apps/prefs.cc
deleted file mode 100644
index 0521a5c..0000000
--- a/apps/prefs.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "apps/prefs.h"
-
-#include "apps/pref_names.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "components/pref_registry/pref_registry_syncable.h"
-
-namespace apps {
-
-void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-#if !defined(OS_MACOSX)
-  registry->RegisterBooleanPref(
-      prefs::kAppFullscreenAllowed, true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#endif
-}
-
-}  // namespace apps
diff --git a/apps/prefs.h b/apps/prefs.h
deleted file mode 100644
index fcccfec..0000000
--- a/apps/prefs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef APPS_PREFS_H_
-#define APPS_PREFS_H_
-
-class PrefRegistrySimple;
-
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
-
-namespace apps {
-
-// Register per-profile preferences for the apps system.
-void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
-
-}  // namespace apps
-
-#endif  // APPS_PREFS_H_