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

Side by Side Diff: chrome/browser/automation/automation_provider_observers.h

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ 5 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
6 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ 6 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 901
902 private: 902 private:
903 // Overriden from DomOperationObserver. 903 // Overriden from DomOperationObserver.
904 virtual void OnDomOperationCompleted(const std::string& json); 904 virtual void OnDomOperationCompleted(const std::string& json);
905 905
906 // Called by the ThumbnailGenerator when the requested snapshot has been 906 // Called by the ThumbnailGenerator when the requested snapshot has been
907 // generated. 907 // generated.
908 void OnSnapshotTaken(const SkBitmap& bitmap); 908 void OnSnapshotTaken(const SkBitmap& bitmap);
909 909
910 // Helper method to send arbitrary javascript to the renderer for evaluation. 910 // Helper method to send arbitrary javascript to the renderer for evaluation.
911 void ExecuteScript(const std::wstring& javascript); 911 void ExecuteScript(const std::string& javascript);
Evan Martin 2011/02/04 21:37:29 In theory this can be Unicode. (In particular, co
Nirnimesh 2011/02/04 21:59:19 +1. We have tests that might pass non-ascii
Avi (use Gerrit) 2011/02/04 23:02:11 OK
912 912
913 // Helper method to send a response back to the client. Deletes this. 913 // Helper method to send a response back to the client. Deletes this.
914 void SendMessage(bool success); 914 void SendMessage(bool success);
915 915
916 AutomationProvider* automation_; 916 AutomationProvider* automation_;
917 IPC::Message* reply_message_; 917 IPC::Message* reply_message_;
918 RenderViewHost* render_view_; 918 RenderViewHost* render_view_;
919 FilePath image_path_; 919 FilePath image_path_;
920 bool received_width_; 920 bool received_width_;
921 gfx::Size entire_page_size_; 921 gfx::Size entire_page_size_;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 void RunOnProcessLauncherThread(); 1086 void RunOnProcessLauncherThread();
1087 void RunOnUIThread(); 1087 void RunOnUIThread();
1088 1088
1089 scoped_refptr<AutomationProvider> automation_; 1089 scoped_refptr<AutomationProvider> automation_;
1090 IPC::Message* reply_message_; 1090 IPC::Message* reply_message_;
1091 1091
1092 DISALLOW_COPY_AND_ASSIGN(WaitForProcessLauncherThreadToGoIdleObserver); 1092 DISALLOW_COPY_AND_ASSIGN(WaitForProcessLauncherThreadToGoIdleObserver);
1093 }; 1093 };
1094 1094
1095 #endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ 1095 #endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698