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

Side by Side Diff: webkit/tools/test_shell/test_shell.h

Issue 9003013: Remove some wstrings in test_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 void ResetTestController(); 170 void ResetTestController();
171 171
172 // Passes options from LayoutTestController through to the delegate (or 172 // Passes options from LayoutTestController through to the delegate (or
173 // any other caller). 173 // any other caller).
174 bool AcceptsEditing() { 174 bool AcceptsEditing() {
175 return layout_test_controller_->AcceptsEditing(); 175 return layout_test_controller_->AcceptsEditing();
176 } 176 }
177 177
178 void LoadFile(const FilePath& file); 178 void LoadFile(const FilePath& file);
179 void LoadURL(const GURL& url); 179 void LoadURL(const GURL& url);
180 void LoadURLForFrame(const GURL& url, const std::wstring& frame_name); 180 void LoadURLForFrame(const GURL& url, const string16& frame_name);
181 void GoBackOrForward(int offset); 181 void GoBackOrForward(int offset);
182 void Reload(); 182 void Reload();
183 bool Navigate(const TestNavigationEntry& entry, bool reload); 183 bool Navigate(const TestNavigationEntry& entry, bool reload);
184 184
185 bool PromptForSaveFile(const wchar_t* prompt_title, FilePath* result); 185 bool PromptForSaveFile(const wchar_t* prompt_title, FilePath* result);
186 string16 GetDocumentText(); 186 string16 GetDocumentText();
187 void DumpDocumentText(); 187 void DumpDocumentText();
188 void DumpRenderTree(); 188 void DumpRenderTree();
189 189
190 gfx::NativeWindow mainWnd() const { return m_mainWnd; } 190 gfx::NativeWindow mainWnd() const { return m_mainWnd; }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 #if defined(OS_WIN) 438 #if defined(OS_WIN)
439 // Used by the watchdog to know when it's finished. 439 // Used by the watchdog to know when it's finished.
440 HANDLE finished_event_; 440 HANDLE finished_event_;
441 #endif 441 #endif
442 442
443 // Dump the stats table counters on exit. 443 // Dump the stats table counters on exit.
444 bool dump_stats_table_on_exit_; 444 bool dump_stats_table_on_exit_;
445 }; 445 };
446 446
447 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ 447 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_navigation_controller.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698