Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / common / common_message_generator.h

diff --git a/src/chrome/common/common_message_generator.h b/src/chrome/common/common_message_generator.h
index 4034fb3..216f748 100644 (file)
--- a/src/chrome/common/common_message_generator.h
+++ b/src/chrome/common/common_message_generator.h
@@ -8,30 +8,38 @@
 #include "chrome/common/benchmarking_messages.h"
 #include "chrome/common/cast_messages.h"
 #include "chrome/common/chrome_utility_messages.h"
+// TODO(thestig) move this inside defined(ENABLE_EXTENSIONS)
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "chrome/common/prefetch_messages.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/safe_browsing/safebrowsing_messages.h"
-#include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/tts_messages.h"
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/common/extensions/chrome_utility_extensions_messages.h"
+#endif
+
 #if defined(ENABLE_MDNS)
 #include "chrome/common/local_discovery/local_discovery_messages.h"
 #endif
 
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/common/chrome_utility_printing_messages.h"
+#include "chrome/common/service_messages.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #include "chrome/common/print_messages.h"
 #endif
 
-#if defined(ENABLE_FULL_PRINTING)
-#include "chrome/common/service_messages.h"
+#if defined(ENABLE_SPELLCHECK)
+#include "chrome/common/spellcheck_messages.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/common/media/webrtc_logging_messages.h"
 #endif
+
+#if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
+#include "chrome/common/safe_browsing/safebrowsing_messages.h"
+#endif