diff options
| author | machenbach <machenbach@chromium.org> | 2014-08-25 01:46:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 08:47:43 +0000 |
| commit | 6f93ff91cd3dba63a70f2b860a99c34503580fbb (patch) | |
| tree | 4ba9c85589703f78898e3fdd3957a07b68e82929 /extensions | |
| parent | 5e4eefdecbd95539899f2a060c27b802466f5182 (diff) | |
| download | chromium_src-6f93ff91cd3dba63a70f2b860a99c34503580fbb.zip chromium_src-6f93ff91cd3dba63a70f2b860a99c34503580fbb.tar.gz chromium_src-6f93ff91cd3dba63a70f2b860a99c34503580fbb.tar.bz2 | |
Revert of Merge apps/pref* to extensions/browser/pref* (patchset #1 of https://codereview.chromium.org/493003002/)
Reason for revert:
Breaks GN:
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/10608
Original issue's description:
> 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.
>
> Committed: https://chromium.googlesource.com/chromium/src/+/3da4417c5baa6b8fe0be9aa012f0fd3294d9dbc7
TBR=benwells@chromium.org,bauerb@chromium.org,bartfab@chromium.org,hashimoto@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=403726
Review URL: https://codereview.chromium.org/499253002
Cr-Commit-Position: refs/heads/master@{#291652}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/extension_prefs.cc | 6 | ||||
| -rw-r--r-- | extensions/browser/pref_names.cc | 1 | ||||
| -rw-r--r-- | extensions/browser/pref_names.h | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc index 864a4f9..aa7fd59 100644 --- a/extensions/browser/extension_prefs.cc +++ b/extensions/browser/extension_prefs.cc @@ -1995,12 +1995,6 @@ void ExtensionPrefs::RegisterProfilePrefs( kCorruptedDisableCount, 0, // default value user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); - -#if !defined(OS_MACOSX) - registry->RegisterBooleanPref( - pref_names::kAppFullscreenAllowed, true, - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); -#endif } template <class ExtensionIdContainer> diff --git a/extensions/browser/pref_names.cc b/extensions/browser/pref_names.cc index 94b386c..f08b689 100644 --- a/extensions/browser/pref_names.cc +++ b/extensions/browser/pref_names.cc @@ -30,7 +30,6 @@ bool ScopeToPrefName(ExtensionPrefsScope scope, std::string* result) { const char kAlertsInitialized[] = "extensions.alerts.initialized"; const char kAllowedInstallSites[] = "extensions.allowed_install_sites"; const char kAllowedTypes[] = "extensions.allowed_types"; -const char kAppFullscreenAllowed[] = "apps.fullscreen.allowed"; const char kBookmarkAppCreationLaunchType[] = "extensions.bookmark_app_creation_launch_type"; const char kExtensions[] = "extensions.settings"; diff --git a/extensions/browser/pref_names.h b/extensions/browser/pref_names.h index e552455..20f39f7 100644 --- a/extensions/browser/pref_names.h +++ b/extensions/browser/pref_names.h @@ -36,9 +36,6 @@ extern const char kAllowedInstallSites[]; // kInstallForceList. extern const char kAllowedTypes[]; -// A boolean that tracks whether apps are allowed to enter fullscreen mode. -extern const char kAppFullscreenAllowed[]; - // Integer which specifies the launch type that bookmark apps are created with // by default. extern const char kBookmarkAppCreationLaunchType[]; |