summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-09-18 15:57:13 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-18 22:57:28 +0000
commitb012bc3d7d404903fb75f3bbee11d95de0ad961b (patch)
tree765e8a0008555da5bbc7cd3f253d297da5a44c57 /extensions
parent3e8588fa8fd144eb68acd3965f3dedbfcf9e7673 (diff)
downloadchromium_src-b012bc3d7d404903fb75f3bbee11d95de0ad961b.zip
chromium_src-b012bc3d7d404903fb75f3bbee11d95de0ad961b.tar.gz
chromium_src-b012bc3d7d404903fb75f3bbee11d95de0ad961b.tar.bz2
Cleanup: Remove unneeded extension_messages.h usage and ifdef out some extensions code usage when extensions are disabled.
Review URL: https://codereview.chromium.org/559523004 Cr-Commit-Position: refs/heads/master@{#295587}
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/lazy_background_task_queue.cc1
-rw-r--r--extensions/common/api/bluetooth/bluetooth_manifest_permission.cc1
-rw-r--r--extensions/common/api/sockets/sockets_manifest_permission.cc1
-rw-r--r--extensions/common/api/sockets/sockets_manifest_permission_unittest.cc1
-rw-r--r--extensions/common/permissions/manifest_permission_set_unittest.cc1
-rw-r--r--extensions/renderer/module_system.cc2
-rw-r--r--extensions/renderer/user_script_set.cc1
7 files changed, 1 insertions, 7 deletions
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc
index 44a527f..5ac92de 100644
--- a/extensions/browser/lazy_background_task_queue.cc
+++ b/extensions/browser/lazy_background_task_queue.cc
@@ -19,7 +19,6 @@
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_map.h"
#include "extensions/common/extension.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/manifest_handlers/background_info.h"
#include "extensions/common/view_type.h"
diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
index e441e55..0397c41 100644
--- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
@@ -12,7 +12,6 @@
#include "extensions/common/api/bluetooth/bluetooth_manifest_data.h"
#include "extensions/common/api/extensions_manifest_types.h"
#include "extensions/common/error_utils.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/manifest_constants.h"
#include "grit/extensions_strings.h"
#include "ipc/ipc_message.h"
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.cc b/extensions/common/api/sockets/sockets_manifest_permission.cc
index 455d1dad..f695494 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission.cc
@@ -11,7 +11,6 @@
#include "extensions/common/api/extensions_manifest_types.h"
#include "extensions/common/api/sockets/sockets_manifest_data.h"
#include "extensions/common/error_utils.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/manifest_constants.h"
#include "grit/extensions_strings.h"
#include "ipc/ipc_message.h"
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
index e933235..6c96fb2 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
@@ -8,7 +8,6 @@
#include "base/pickle.h"
#include "base/values.h"
#include "extensions/common/api/sockets/sockets_manifest_permission.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/manifest_constants.h"
#include "ipc/ipc_message.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/extensions/common/permissions/manifest_permission_set_unittest.cc b/extensions/common/permissions/manifest_permission_set_unittest.cc
index fdfec16..ddac081 100644
--- a/extensions/common/permissions/manifest_permission_set_unittest.cc
+++ b/extensions/common/permissions/manifest_permission_set_unittest.cc
@@ -4,7 +4,6 @@
#include "base/pickle.h"
#include "base/values.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/permissions/manifest_permission.h"
#include "extensions/common/permissions/manifest_permission_set.h"
#include "ipc/ipc_message.h"
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index 5938556..2188341 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "content/public/renderer/render_view.h"
-#include "extensions/common/extension_messages.h"
+#include "extensions/common/extension.h"
#include "extensions/common/extensions_client.h"
#include "extensions/renderer/console.h"
#include "extensions/renderer/safe_builtins.h"
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index c14abd1..92608bd 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -7,7 +7,6 @@
#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_thread.h"
#include "extensions/common/extension.h"
-#include "extensions/common/extension_messages.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/renderer/extensions_renderer_client.h"