diff options
| author | hashimoto <hashimoto@chromium.org> | 2014-08-25 01:19:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 08:19:58 +0000 |
| commit | 77b343e018d1ed88bc9ce96fc9a9055c2e1c5cde (patch) | |
| tree | d1a433bd41d41b0adc6f425895f10292478af281 /apps/apps.gypi | |
| parent | f51f1160c7d514e8f604c974199e14e3088e6b5d (diff) | |
| download | chromium_src-77b343e018d1ed88bc9ce96fc9a9055c2e1c5cde.zip chromium_src-77b343e018d1ed88bc9ce96fc9a9055c2e1c5cde.tar.gz chromium_src-77b343e018d1ed88bc9ce96fc9a9055c2e1c5cde.tar.bz2 | |
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}
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 4 |
1 files changed, 0 insertions, 4 deletions
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', |