Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: chrome/common/all_messages.h

Issue 12045031: Disabling automation on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed last suggestion from John Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/all_messages.h
diff --git a/chrome/common/all_messages.h b/chrome/common/all_messages.h
index 114bf9dfb0d971b2438aa0e218045f94c09e19e8..6e3eb1e6e6b8c7c78e80c041d60534a7537aa27f 100644
--- a/chrome/common/all_messages.h
+++ b/chrome/common/all_messages.h
@@ -12,10 +12,14 @@
#if !defined(OS_ANDROID)
#include "chrome/browser/importer/profile_import_process_messages.h"
#endif
+
+#if defined(ENABLE_AUTOMATION)
// We can't make common_message_generator.h include automation_messages, since
// otherwise the Chrome Frame binaries will link in a lot of unrelated chrome
// code. Chrome Frame should not be depending on the chrome target...
// See http:://crbug.com/101208 and http://crbug.com/101215
#include "chrome/common/automation_messages.h"
+#endif
+
#include "chrome/common/common_message_generator.h"
#include "chrome/common/nacl_messages.h"
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698