diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 08:50:56 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 08:50:56 +0000 |
| commit | 7eb20e39b770ec5d8eb118133cfc5ed291be0e0e (patch) | |
| tree | c47cb63b276f1b02b8c5aadc3d6fbcd4d620f33d /apps/DEPS | |
| parent | 1788ebba6cc645af4bea3e84ef5ab2c178496a81 (diff) | |
| download | chromium_src-7eb20e39b770ec5d8eb118133cfc5ed291be0e0e.zip chromium_src-7eb20e39b770ec5d8eb118133cfc5ed291be0e0e.tar.gz chromium_src-7eb20e39b770ec5d8eb118133cfc5ed291be0e0e.tar.bz2 | |
Break src/extensions dependency on Chrome's theme_resources.h / .pak
* Move GetDefaultAppIcon and GetDefaultExtensionIcon out of src/extensions
into chrome/browser.
* Inline one call to GetDefaultAppIcon in src/apps
This requires a DEPS exception in src/apps for grit/theme_resources.h, but
that's better than having one in src/extensions (as src/apps is much higher
in the dependency tree).
No functional changes.
BUG=368334
TEST=Clean build of extensions_unittests succeeds, Chrome about:extensions still displays default icon for extension with no icon.
TBR=msw@chromium.org for mechanical namespace/include changes in chrome/browser/ui/views/
Review URL: https://codereview.chromium.org/259343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/DEPS')
| -rw-r--r-- | apps/DEPS | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -24,6 +24,9 @@ include_rules = [ "+chrome/browser/sessions/session_id.h", "+chrome/common/chrome_switches.h", + # For default app icon. + "!grit/theme_resources.h", + # Pieces of the extensions system that need to move to src/extensions. # See http://crbug.com/162530 for details. "+chrome/browser/extensions/api/file_handlers/app_file_handler_util.h", @@ -33,7 +36,6 @@ include_rules = [ "+chrome/browser/extensions/suggest_permission_util.h", "+chrome/browser/extensions/unpacked_installer.h", "+chrome/common/extensions/api/app_window.h", - "+chrome/common/extensions/manifest_handlers/icons_handler.h", ] specific_include_rules = { |