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

Side by Side Diff: chrome/test/chromedriver/chrome/chrome_desktop_impl.h

Issue 2777883003: Remove ScopedVector from chrome/test/chromedriver/ (Closed)
Patch Set: address nit from stgao@ Created 3 years, 8 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector>
10 11
11 #include "base/command_line.h" 12 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
14 #include "base/process/process.h" 15 #include "base/process/process.h"
15 #include "chrome/test/chromedriver/chrome/chrome_impl.h" 16 #include "chrome/test/chromedriver/chrome/chrome_impl.h"
16 17
17 namespace base { 18 namespace base {
18 class TimeDelta; 19 class TimeDelta;
19 } 20 }
20 21
21 class AutomationExtension; 22 class AutomationExtension;
22 class DevToolsClient; 23 class DevToolsClient;
23 class DevToolsHttpClient; 24 class DevToolsHttpClient;
24 class Status; 25 class Status;
25 class WebView; 26 class WebView;
26 27
27 class ChromeDesktopImpl : public ChromeImpl { 28 class ChromeDesktopImpl : public ChromeImpl {
28 public: 29 public:
29 ChromeDesktopImpl( 30 ChromeDesktopImpl(std::unique_ptr<DevToolsHttpClient> http_client,
30 std::unique_ptr<DevToolsHttpClient> http_client, 31 std::unique_ptr<DevToolsClient> websocket_client,
31 std::unique_ptr<DevToolsClient> websocket_client, 32 std::vector<std::unique_ptr<DevToolsEventListener>>
32 ScopedVector<DevToolsEventListener>& devtools_event_listeners, 33 devtools_event_listeners,
33 std::unique_ptr<PortReservation> port_reservation, 34 std::unique_ptr<PortReservation> port_reservation,
34 std::string page_load_strategy, 35 std::string page_load_strategy,
35 base::Process process, 36 base::Process process,
36 const base::CommandLine& command, 37 const base::CommandLine& command,
37 base::ScopedTempDir* user_data_dir, 38 base::ScopedTempDir* user_data_dir,
38 base::ScopedTempDir* extension_dir, 39 base::ScopedTempDir* extension_dir,
39 bool network_emulation_enabled); 40 bool network_emulation_enabled);
40 ~ChromeDesktopImpl() override; 41 ~ChromeDesktopImpl() override;
41 42
42 // Waits for a page with the given URL to appear and finish loading. 43 // Waits for a page with the given URL to appear and finish loading.
43 // Returns an error if the timeout is exceeded. 44 // Returns an error if the timeout is exceeded.
44 Status WaitForPageToLoad(const std::string& url, 45 Status WaitForPageToLoad(const std::string& url,
45 const base::TimeDelta& timeout, 46 const base::TimeDelta& timeout,
46 std::unique_ptr<WebView>* web_view, 47 std::unique_ptr<WebView>* web_view,
47 bool w3c_compliant); 48 bool w3c_compliant);
48 49
49 // Gets the installed automation extension. 50 // Gets the installed automation extension.
(...skipping 21 matching lines...) Expand all
71 base::ScopedTempDir user_data_dir_; 72 base::ScopedTempDir user_data_dir_;
72 base::ScopedTempDir extension_dir_; 73 base::ScopedTempDir extension_dir_;
73 bool network_connection_enabled_; 74 bool network_connection_enabled_;
74 int network_connection_; 75 int network_connection_;
75 76
76 // Lazily initialized, may be null. 77 // Lazily initialized, may be null.
77 std::unique_ptr<AutomationExtension> automation_extension_; 78 std::unique_ptr<AutomationExtension> automation_extension_;
78 }; 79 };
79 80
80 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ 81 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome/chrome_android_impl.cc ('k') | chrome/test/chromedriver/chrome/chrome_desktop_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698