summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 23:07:41 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 23:07:41 +0000
commite4452d31c6aadb6e9c86836e8b45c0c151223826 (patch)
tree465eb8100a1d86ab889cd9f3f709df1703597a81 /chrome/browser/speech
parent741c3917b61418986e76534c2bc68394f6f23d29 (diff)
downloadchromium_src-e4452d31c6aadb6e9c86836e8b45c0c151223826.zip
chromium_src-e4452d31c6aadb6e9c86836e8b45c0c151223826.tar.gz
chromium_src-e4452d31c6aadb6e9c86836e8b45c0c151223826.tar.bz2
Move Extension and PermissionsData to extensions/common.
BUG=298586 R=cdn@chromium.org, miket@chromium.org, sky@chromium.org TBR=cdn@chromium.org Review URL: https://codereview.chromium.org/15239002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/extension_api/tts_engine_extension_api.cc2
-rw-r--r--chrome/browser/speech/tts_controller.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
index b5d0a6a..87c9c3a 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
@@ -17,12 +17,12 @@
#include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
#include "chrome/browser/speech/tts_controller.h"
#include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h"
-#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_messages.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/common/console_message_level.h"
#include "extensions/browser/process_manager.h"
+#include "extensions/common/extension.h"
#include "net/base/network_change_notifier.h"
using extensions::EventRouter;
diff --git a/chrome/browser/speech/tts_controller.cc b/chrome/browser/speech/tts_controller.cc
index 34f72a4..902168c 100644
--- a/chrome/browser/speech/tts_controller.cc
+++ b/chrome/browser/speech/tts_controller.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/speech/extension_api/tts_extension_api.h"
#include "chrome/browser/speech/tts_platform.h"
#include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h"
-#include "chrome/common/extensions/extension.h"
+#include "extensions/common/extension.h"
namespace {
// A value to be used to indicate that there is no char index available.