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

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

Issue 1601323002: Use GetLastCommittedOrigin instead of GetLastCommittedURL in bluetooth chooser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed bluetooth test at: requestDevice.html Created 4 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
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 <ostream> 8 #include <ostream>
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 #include "content/public/common/web_preferences.h" 23 #include "content/public/common/web_preferences.h"
24 #include "content/shell/common/leak_detection_result.h" 24 #include "content/shell/common/leak_detection_result.h"
25 #include "ui/gfx/geometry/size.h" 25 #include "ui/gfx/geometry/size.h"
26 26
27 #if defined(OS_ANDROID) 27 #if defined(OS_ANDROID)
28 #include "base/threading/thread_restrictions.h" 28 #include "base/threading/thread_restrictions.h"
29 #endif 29 #endif
30 30
31 class SkBitmap; 31 class SkBitmap;
32 32
33 namespace url {
34 class Origin;
35 }
36
33 namespace content { 37 namespace content {
34 38
35 class LayoutTestBluetoothChooserFactory; 39 class LayoutTestBluetoothChooserFactory;
36 class LayoutTestDevToolsFrontend; 40 class LayoutTestDevToolsFrontend;
37 class Shell; 41 class Shell;
38 42
39 #if defined(OS_ANDROID) 43 #if defined(OS_ANDROID)
40 // Android uses a nested message loop for running layout tests because the 44 // Android uses a nested message loop for running layout tests because the
41 // default message loop, provided by the system, does not offer a blocking 45 // default message loop, provided by the system, does not offer a blocking
42 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid, 46 // Run() method. The loop itself, implemented as NestedMessagePumpAndroid,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 128
125 void SetTempPath(const base::FilePath& temp_path); 129 void SetTempPath(const base::FilePath& temp_path);
126 void RendererUnresponsive(); 130 void RendererUnresponsive();
127 void OverrideWebkitPrefs(WebPreferences* prefs); 131 void OverrideWebkitPrefs(WebPreferences* prefs);
128 void OpenURL(const GURL& url); 132 void OpenURL(const GURL& url);
129 void TestFinishedInSecondaryWindow(); 133 void TestFinishedInSecondaryWindow();
130 bool IsMainWindow(WebContents* web_contents) const; 134 bool IsMainWindow(WebContents* web_contents) const;
131 scoped_ptr<BluetoothChooser> RunBluetoothChooser( 135 scoped_ptr<BluetoothChooser> RunBluetoothChooser(
132 WebContents* web_contents, 136 WebContents* web_contents,
133 const BluetoothChooser::EventHandler& event_handler, 137 const BluetoothChooser::EventHandler& event_handler,
134 const GURL& origin); 138 const url::Origin& origin);
135 139
136 BlinkTestResultPrinter* printer() { return printer_.get(); } 140 BlinkTestResultPrinter* printer() { return printer_.get(); }
137 void set_printer(BlinkTestResultPrinter* printer) { printer_.reset(printer); } 141 void set_printer(BlinkTestResultPrinter* printer) { printer_.reset(printer); }
138 142
139 void DevToolsProcessCrashed(); 143 void DevToolsProcessCrashed();
140 144
141 // WebContentsObserver implementation. 145 // WebContentsObserver implementation.
142 bool OnMessageReceived(const IPC::Message& message) override; 146 bool OnMessageReceived(const IPC::Message& message) override;
143 void PluginCrashed(const base::FilePath& plugin_path, 147 void PluginCrashed(const base::FilePath& plugin_path,
144 base::ProcessId plugin_pid) override; 148 base::ProcessId plugin_pid) override;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // waiting on the UI thread while layout tests are being ran. 238 // waiting on the UI thread while layout tests are being ran.
235 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 239 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
236 #endif 240 #endif
237 241
238 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); 242 DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
239 }; 243 };
240 244
241 } // namespace content 245 } // namespace content
242 246
243 #endif // CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_ 247 #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