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

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

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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) 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 CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 class PortReservation; 23 class PortReservation;
24 class Status; 24 class Status;
25 class WebView; 25 class WebView;
26 class WebViewImpl; 26 class WebViewImpl;
27 27
28 class ChromeImpl : public Chrome { 28 class ChromeImpl : public Chrome {
29 public: 29 public:
30 virtual ~ChromeImpl(); 30 virtual ~ChromeImpl();
31 31
32 // Overridden from Chrome: 32 // Overridden from Chrome:
33 virtual ChromeDesktopImpl* GetAsDesktop() OVERRIDE; 33 virtual ChromeDesktopImpl* GetAsDesktop() override;
34 virtual const BrowserInfo* GetBrowserInfo() OVERRIDE; 34 virtual const BrowserInfo* GetBrowserInfo() override;
35 virtual bool HasCrashedWebView() OVERRIDE; 35 virtual bool HasCrashedWebView() override;
36 virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) OVERRIDE; 36 virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) override;
37 virtual Status GetWebViewById(const std::string& id, 37 virtual Status GetWebViewById(const std::string& id,
38 WebView** web_view) OVERRIDE; 38 WebView** web_view) override;
39 virtual Status CloseWebView(const std::string& id) OVERRIDE; 39 virtual Status CloseWebView(const std::string& id) override;
40 virtual Status ActivateWebView(const std::string& id) OVERRIDE; 40 virtual Status ActivateWebView(const std::string& id) override;
41 virtual bool IsMobileEmulationEnabled() const OVERRIDE; 41 virtual bool IsMobileEmulationEnabled() const override;
42 virtual Status Quit() OVERRIDE; 42 virtual Status Quit() override;
43 43
44 protected: 44 protected:
45 ChromeImpl( 45 ChromeImpl(
46 scoped_ptr<DevToolsHttpClient> http_client, 46 scoped_ptr<DevToolsHttpClient> http_client,
47 scoped_ptr<DevToolsClient> websocket_client, 47 scoped_ptr<DevToolsClient> websocket_client,
48 ScopedVector<DevToolsEventListener>& devtools_event_listeners, 48 ScopedVector<DevToolsEventListener>& devtools_event_listeners,
49 scoped_ptr<PortReservation> port_reservation); 49 scoped_ptr<PortReservation> port_reservation);
50 50
51 virtual Status QuitImpl() = 0; 51 virtual Status QuitImpl() = 0;
52 52
53 bool quit_; 53 bool quit_;
54 scoped_ptr<DevToolsHttpClient> devtools_http_client_; 54 scoped_ptr<DevToolsHttpClient> devtools_http_client_;
55 scoped_ptr<DevToolsClient> devtools_websocket_client_; 55 scoped_ptr<DevToolsClient> devtools_websocket_client_;
56 56
57 private: 57 private:
58 typedef std::list<linked_ptr<WebViewImpl> > WebViewList; 58 typedef std::list<linked_ptr<WebViewImpl> > WebViewList;
59 59
60 // Web views in this list are in the same order as they are opened. 60 // Web views in this list are in the same order as they are opened.
61 WebViewList web_views_; 61 WebViewList web_views_;
62 ScopedVector<DevToolsEventListener> devtools_event_listeners_; 62 ScopedVector<DevToolsEventListener> devtools_event_listeners_;
63 scoped_ptr<PortReservation> port_reservation_; 63 scoped_ptr<PortReservation> port_reservation_;
64 }; 64 };
65 65
66 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_ 66 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome/chrome_desktop_impl.h ('k') | chrome/test/chromedriver/chrome/chrome_remote_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698