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

Side by Side Diff: content/shell/webkit_test_runner.h

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
7 7
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/public/renderer/render_view_observer.h" 10 #include "content/public/renderer/render_view_observer.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void DumpCreateView(); 95 void DumpCreateView();
96 96
97 void NotImplemented(const std::string& object, const std::string& method); 97 void NotImplemented(const std::string& object, const std::string& method);
98 98
99 void set_proxy(::WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; } 99 void set_proxy(::WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; }
100 100
101 private: 101 private:
102 // Message handlers. 102 // Message handlers.
103 void OnCaptureTextDump(bool as_text, bool printing, bool recursive); 103 void OnCaptureTextDump(bool as_text, bool printing, bool recursive);
104 void OnCaptureImageDump(const std::string& expected_pixel_hash); 104 void OnCaptureImageDump(const std::string& expected_pixel_hash);
105 void OnSetCurrentWorkingDirectory(const FilePath& current_working_directory); 105 void OnSetCurrentWorkingDirectory(
106 const base::FilePath& current_working_directory);
106 107
107 SkCanvas* GetCanvas(); 108 SkCanvas* GetCanvas();
108 void PaintRect(const WebKit::WebRect& rect); 109 void PaintRect(const WebKit::WebRect& rect);
109 void PaintInvalidatedRegion(); 110 void PaintInvalidatedRegion();
110 void DisplayRepaintMask(); 111 void DisplayRepaintMask();
111 112
112 scoped_ptr<SkCanvas> canvas_; 113 scoped_ptr<SkCanvas> canvas_;
113 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_; 114 scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_;
114 FilePath current_working_directory_; 115 base::FilePath current_working_directory_;
115 116
116 ::WebTestRunner::WebTestProxyBase* proxy_; 117 ::WebTestRunner::WebTestProxyBase* proxy_;
117 118
118 ::WebTestRunner::WebPreferences prefs_; 119 ::WebTestRunner::WebPreferences prefs_;
119 120
120 #if defined(ENABLE_WEB_INTENTS) 121 #if defined(ENABLE_WEB_INTENTS)
121 WebKit::WebIntentRequest intent_request_; 122 WebKit::WebIntentRequest intent_request_;
122 #endif 123 #endif
123 124
124 bool dump_editing_callbacks_; 125 bool dump_editing_callbacks_;
(...skipping 10 matching lines...) Expand all
135 bool test_is_running_; 136 bool test_is_running_;
136 bool wait_until_done_; 137 bool wait_until_done_;
137 bool load_finished_; 138 bool load_finished_;
138 139
139 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner); 140 DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
140 }; 141 };
141 142
142 } // namespace content 143 } // namespace content
143 144
144 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_ 145 #endif // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/webkit_test_platform_support_linux.cc ('k') | content/shell/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698