summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 18:42:33 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-06 18:42:33 +0000
commit582d12b08ae763174677a3357223919f59e316a4 (patch)
tree2d0b6fa0095a2b35348f7f2223a498be232022ad /chrome/browser/extensions
parent79f5c9c4d6de3ccc0e370cae9cceb809bd7a7810 (diff)
downloadchromium_src-582d12b08ae763174677a3357223919f59e316a4.zip
chromium_src-582d12b08ae763174677a3357223919f59e316a4.tar.gz
chromium_src-582d12b08ae763174677a3357223919f59e316a4.tar.bz2
Revert 232631 - Revert 232499 "Move ManifestHandler to top-level extensions."
Was not the cause of breakage. See bug for that. BUG=314916 R=benwells@chromium.org TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/60393005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/identity/experimental_identity_api.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/identity/experimental_identity_api.cc b/chrome/browser/extensions/api/identity/experimental_identity_api.cc
index 97a4edc..84cea40 100644
--- a/chrome/browser/extensions/api/identity/experimental_identity_api.cc
+++ b/chrome/browser/extensions/api/identity/experimental_identity_api.cc
@@ -23,9 +23,9 @@
#include "chrome/common/extensions/api/identity.h"
#include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/manifest_handler.h"
#include "chrome/common/url_constants.h"
#include "content/public/common/page_transition_types.h"
+#include "extensions/common/manifest_handler.h"
#include "google_apis/gaia/gaia_constants.h"
#include "ui/base/window_open_disposition.h"
#include "url/gurl.h"