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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 9863047: Exclude ProtectorService code from Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 36bbcd8b6e8afa9c2860d3237ed9be43104966f3..a7601ad3daadf66e6db298f70f5191bca24892cb 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -79,6 +79,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/protector/protector_service.h"
#include "chrome/browser/protector/protector_service_factory.h"
+#include "chrome/browser/protector/protector_utils.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
@@ -2528,10 +2529,12 @@ void TestingAutomationProvider::SendJSONRequest(int handle,
browser_handler_map["PerformActionOnSearchEngine"] =
&TestingAutomationProvider::PerformActionOnSearchEngine;
+#if defined(ENABLE_PROTECTOR_SERVICE)
browser_handler_map["GetProtectorState"] =
&TestingAutomationProvider::GetProtectorState;
browser_handler_map["PerformProtectorAction"] =
&TestingAutomationProvider::PerformProtectorAction;
+#endif
browser_handler_map["SetWindowDimensions"] =
&TestingAutomationProvider::SetWindowDimensions;
@@ -3453,6 +3456,7 @@ void TestingAutomationProvider::PerformActionOnSearchEngine(
}
}
+#if defined(ENABLE_PROTECTOR_SERVICE)
// Sample json output: { "enabled": true,
// "showing_change": false }
void TestingAutomationProvider::GetProtectorState(
@@ -3497,6 +3501,7 @@ void TestingAutomationProvider::PerformProtectorAction(
return reply.SendError("Invalid 'action' value");
reply.SendSuccess(NULL);
}
+#endif // defined(ENABLE_PROTECTOR_SERVICE)
// Sample json input: { "command": "GetLocalStatePrefsInfo" }
// Refer chrome/test/pyautolib/prefs_info.py for sample json output.
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.h ('k') | chrome/browser/profiles/profile_dependency_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698