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

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

Issue 1672103002: Pass the frame instead of the WebContents through RunBluetoothChooser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@doc-bubble-lifetimes
Patch Set: Fix Android Created 4 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
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_BLINK_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <ostream> 9 #include <ostream>
10 #include <string> 10 #include <string>
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // True if the controller was reset successfully. 129 // True if the controller was reset successfully.
130 bool ResetAfterLayoutTest(); 130 bool ResetAfterLayoutTest();
131 131
132 void SetTempPath(const base::FilePath& temp_path); 132 void SetTempPath(const base::FilePath& temp_path);
133 void RendererUnresponsive(); 133 void RendererUnresponsive();
134 void OverrideWebkitPrefs(WebPreferences* prefs); 134 void OverrideWebkitPrefs(WebPreferences* prefs);
135 void OpenURL(const GURL& url); 135 void OpenURL(const GURL& url);
136 void TestFinishedInSecondaryWindow(); 136 void TestFinishedInSecondaryWindow();
137 bool IsMainWindow(WebContents* web_contents) const; 137 bool IsMainWindow(WebContents* web_contents) const;
138 scoped_ptr<BluetoothChooser> RunBluetoothChooser( 138 scoped_ptr<BluetoothChooser> RunBluetoothChooser(
139 WebContents* web_contents, 139 RenderFrameHost* frame,
140 const BluetoothChooser::EventHandler& event_handler, 140 const BluetoothChooser::EventHandler& event_handler);
141 const url::Origin& origin);
142 141
143 BlinkTestResultPrinter* printer() { return printer_.get(); } 142 BlinkTestResultPrinter* printer() { return printer_.get(); }
144 void set_printer(BlinkTestResultPrinter* printer) { printer_.reset(printer); } 143 void set_printer(BlinkTestResultPrinter* printer) { printer_.reset(printer); }
145 144
146 void DevToolsProcessCrashed(); 145 void DevToolsProcessCrashed();
147 146
148 // WebContentsObserver implementation. 147 // WebContentsObserver implementation.
149 bool OnMessageReceived(const IPC::Message& message) override; 148 bool OnMessageReceived(const IPC::Message& message) override;
150 bool OnMessageReceived(const IPC::Message& message, 149 bool OnMessageReceived(const IPC::Message& message,
151 RenderFrameHost* render_frame_host) override; 150 RenderFrameHost* render_frame_host) override;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // waiting on the UI thread while layout tests are being ran. 251 // waiting on the UI thread while layout tests are being ran.
253 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 252 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
254 #endif 253 #endif
255 254
256 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 255 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
257 }; 256 };
258 257
259 } // namespace content 258 } // namespace content
260 259
261 #endif // CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_ 260 #endif // CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_delegate.cc ('k') | content/shell/browser/blink_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698