summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications/web_app.cc
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 04:53:37 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 04:53:37 +0000
commit326e6f0abee2401bc1676b600653a851283d8b06 (patch)
treebaf666c929ee22517f4c7750369ce4b2bd03f8ae /chrome/browser/web_applications/web_app.cc
parent6cb17c0190e848b0af0e618520f5e9429ac0dca3 (diff)
downloadchromium_src-326e6f0abee2401bc1676b600653a851283d8b06.zip
chromium_src-326e6f0abee2401bc1676b600653a851283d8b06.tar.gz
chromium_src-326e6f0abee2401bc1676b600653a851283d8b06.tar.bz2
Moves extension_icon_image and image_loader to extensions/browser
Now extension_icon_image and image_loader are safe to be used outside of Chrome, like AppShell/Athena. BUG=159265, 380421 R=yoz@chromium.org, jamescook@chromium.org TBR=sky@chromium.org, fmalita@chromium.org TEST=unit_tests, compile succeeds Review URL: https://codereview.chromium.org/334053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications/web_app.cc')
-rw-r--r--chrome/browser/web_applications/web_app.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 67d3fbe..118492e 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -13,7 +13,6 @@
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h"
#include "chrome/browser/extensions/extension_ui_util.h"
-#include "chrome/browser/extensions/image_loader.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
@@ -23,6 +22,7 @@
#include "chrome/common/pref_names.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/image_loader.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"