summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 15:07:08 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 15:07:08 +0000
commitfb820c07559f3873ac0a2cbfe0d78677ca42551a (patch)
tree2a5000ae02ffa7f770eb213d3773eb5e8f8bab66 /apps
parent41d04938902da920ce6cac3079376ca67bdab349 (diff)
downloadchromium_src-fb820c07559f3873ac0a2cbfe0d78677ca42551a.zip
chromium_src-fb820c07559f3873ac0a2cbfe0d78677ca42551a.tar.gz
chromium_src-fb820c07559f3873ac0a2cbfe0d78677ca42551a.tar.bz2
Move extension_messages.h to extensions/common.
Move most of chrome/common/extensions/extension_messages.h into a new extensions/common/extension_messages.h file. WebApplicationInfo-related IPC definitions are now in chrome/common/extensions/chrome_extension_messages.h. BUG=335159 TBR=sky@chromium.org,cdn@chromium.org Review URL: https://codereview.chromium.org/194333002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/DEPS1
-rw-r--r--apps/app_window.cc2
-rw-r--r--apps/app_window_contents.cc2
-rw-r--r--apps/launcher.cc2
4 files changed, 3 insertions, 4 deletions
diff --git a/apps/DEPS b/apps/DEPS
index 4f3f455..d1ca9f4 100644
--- a/apps/DEPS
+++ b/apps/DEPS
@@ -37,7 +37,6 @@ include_rules = [
"+chrome/browser/extensions/unpacked_installer.h",
"+chrome/common/extensions/api/app_runtime.h",
"+chrome/common/extensions/api/app_window.h",
- "+chrome/common/extensions/extension_messages.h",
"+chrome/common/extensions/manifest_handlers/icons_handler.h",
]
diff --git a/apps/app_window.cc b/apps/app_window.cc
index e6f5a5e..3a7c0e5 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/extensions/extension_web_contents_observer.h"
#include "chrome/browser/extensions/suggest_permission_util.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/browser_context.h"
@@ -39,6 +38,7 @@
#include "extensions/browser/process_manager.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_messages.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/gfx/screen.h"
diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc
index d50db9e..eb123b5 100644
--- a/apps/app_window_contents.cc
+++ b/apps/app_window_contents.cc
@@ -7,7 +7,6 @@
#include "apps/ui/native_app_window.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/common/extensions/api/app_window.h"
-#include "chrome/common/extensions/extension_messages.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
@@ -18,6 +17,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/renderer_preferences.h"
+#include "extensions/common/extension_messages.h"
namespace app_window = extensions::api::app_window;
diff --git a/apps/launcher.cc b/apps/launcher.cc
index 599f5f9..4fe2461 100644
--- a/apps/launcher.cc
+++ b/apps/launcher.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/app_runtime.h"
-#include "chrome/common/extensions/extension_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
@@ -28,6 +27,7 @@
#include "extensions/browser/lazy_background_task_queue.h"
#include "extensions/browser/process_manager.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_messages.h"
#include "extensions/common/manifest_handlers/kiosk_mode_info.h"
#include "net/base/mime_util.h"
#include "net/base/net_util.h"