chrome/browser/automation/testing_automation_provider.h - Issue 6312154: Remove wstring from RVH's run Javascript command....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/automation/testing_automation_provider.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, 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/browser/automation/automation_provider_observers.cc ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | chrome/test/webdriver/automation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/testing_automation_provider.h

===================================================================

--- chrome/browser/automation/testing_automation_provider.h (revision 73855)

+++ chrome/browser/automation/testing_automation_provider.h (working copy)

@@ -83,8 +83,8 @@

WindowOpenDisposition disposition,

bool* status);

void Reload(int handle, IPC::Message* reply_message);

- void SetAuth(int tab_handle, const std::wstring& username,

- const std::wstring& password, IPC::Message* reply_message);

+ void SetAuth(int tab_handle, const string16& username,

+ const string16& password, IPC::Message* reply_message);

void CancelAuth(int tab_handle, IPC::Message* reply_message);

void NeedsAuth(int tab_handle, bool* needs_auth);

void GetRedirectsFrom(int tab_handle,

@@ -126,7 +126,7 @@

void GetType(int handle, int* type_as_int);

void GetTab(int win_handle, int tab_index, int* tab_handle);

void GetTabProcessID(int handle, int* process_id);

- void GetTabTitle(int handle, int* title_string_size, std::wstring* title);

+ void GetTabTitle(int handle, int* title_string_size, string16* title);

void GetTabIndex(int handle, int* tabstrip_index);

void GetTabURL(int handle, bool* success, GURL* url);

void GetShelfVisibility(int handle, bool* visible);

@@ -159,8 +159,8 @@

IPC::Message* reply_message);

void ExecuteJavascript(int handle,

- const std::wstring& frame_xpath,

- const std::wstring& script,

+ const string16& frame_xpath,

+ const string16& script,

IPC::Message* reply_message);

void GetConstrainedWindowCount(int handle, int* count);

@@ -270,17 +270,17 @@

// Editing, modification, and removal of bookmarks.

// Bookmarks are referenced by id.

void AddBookmarkGroup(int handle,

- int64 parent_id, int index, std::wstring title,

+ int64 parent_id, int index, const string16& title,

bool* success);

void AddBookmarkURL(int handle,

int64 parent_id, int index,

- std::wstring title, const GURL& url,

+ const string16& title, const GURL& url,

bool* success);

void ReparentBookmark(int handle,

int64 id, int64 new_parent_id, int index,

bool* success);

void SetBookmarkTitle(int handle,

- int64 id, std::wstring title,

+ int64 id, const string16& title,

bool* success);

void SetBookmarkURL(int handle,

int64 id, const GURL& url,