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

Side by Side Diff: content/shell/browser/layout_test/blink_test_controller.h

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Fixing build problems introduced by rebasing... Created 3 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <ostream> 10 #include <ostream>
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 void OnCloseRemainingWindows(); 219 void OnCloseRemainingWindows();
220 void OnResetDone(); 220 void OnResetDone();
221 void OnLeakDetectionDone(const content::LeakDetectionResult& result); 221 void OnLeakDetectionDone(const content::LeakDetectionResult& result);
222 void OnSetBluetoothManualChooser(bool enable); 222 void OnSetBluetoothManualChooser(bool enable);
223 void OnGetBluetoothManualChooserEvents(); 223 void OnGetBluetoothManualChooserEvents();
224 void OnSendBluetoothManualChooserEvent(const std::string& event, 224 void OnSendBluetoothManualChooserEvent(const std::string& event,
225 const std::string& argument); 225 const std::string& argument);
226 mojom::LayoutTestControl* GetLayoutTestControlPtr(RenderFrameHost* frame); 226 mojom::LayoutTestControl* GetLayoutTestControlPtr(RenderFrameHost* frame);
227 void HandleLayoutTestControlError(RenderFrameHost* frame); 227 void HandleLayoutTestControlError(RenderFrameHost* frame);
228 228
229 void OnAllServiceWorkersCleared();
230
229 std::unique_ptr<BlinkTestResultPrinter> printer_; 231 std::unique_ptr<BlinkTestResultPrinter> printer_;
230 232
231 base::FilePath current_working_directory_; 233 base::FilePath current_working_directory_;
232 base::FilePath temp_path_; 234 base::FilePath temp_path_;
233 235
234 Shell* main_window_; 236 Shell* main_window_;
235 Shell* devtools_window_; 237 Shell* devtools_window_;
236 238
237 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_; 239 std::unique_ptr<LayoutTestDevToolsBindings> devtools_bindings_;
238 240
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 #endif 301 #endif
300 302
301 SEQUENCE_CHECKER(sequence_checker_); 303 SEQUENCE_CHECKER(sequence_checker_);
302 304
303 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 305 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
304 }; 306 };
305 307
306 } // namespace content 308 } // namespace content
307 309
308 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ 310 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698