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

Unified Diff: chrome/browser/automation/automation_provider_observers.h

Issue 6623071: Fix AutomationProvider from logging false errors by replacing the persistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: little fix Created 9 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/automation_provider_observers.h
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index 89c131211f7364514376155ec2236930f33fef8e..6c9a5dcf31f6bdf38daf9be91f368ad69d61a6d0 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -507,15 +507,21 @@ class DomOperationObserver : public NotificationObserver {
DISALLOW_COPY_AND_ASSIGN(DomOperationObserver);
};
+// Sends a message back to the automation client with the results of the DOM
+// operation.
class DomOperationMessageSender : public DomOperationObserver {
public:
- explicit DomOperationMessageSender(AutomationProvider* automation);
+ explicit DomOperationMessageSender(AutomationProvider* automation,
+ IPC::Message* relpy_message,
+ bool use_json_interface);
virtual ~DomOperationMessageSender();
virtual void OnDomOperationCompleted(const std::string& json);
private:
base::WeakPtr<AutomationProvider> automation_;
+ scoped_ptr<IPC::Message> reply_message_;
+ bool use_json_interface_;
DISALLOW_COPY_AND_ASSIGN(DomOperationMessageSender);
};
@@ -1152,22 +1158,4 @@ class WaitForProcessLauncherThreadToGoIdleObserver
DISALLOW_COPY_AND_ASSIGN(WaitForProcessLauncherThreadToGoIdleObserver);
};
-// Observes the result of execution of Javascript and sends a JSON reply.
-class ExecuteJavascriptObserver : public DomOperationObserver {
- public:
- ExecuteJavascriptObserver(AutomationProvider* automation,
- IPC::Message* reply_message);
- virtual ~ExecuteJavascriptObserver();
-
- private:
- // Overriden from DomOperationObserver.
- virtual void OnDomOperationCompleted(const std::string& json);
-
- base::WeakPtr<AutomationProvider> automation_;
- scoped_ptr<IPC::Message> reply_message_;
-
- DISALLOW_COPY_AND_ASSIGN(ExecuteJavascriptObserver);
-};
-
-
#endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/automation_provider_observers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698