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

Side by Side Diff: chrome/test/chromedriver/chrome/navigation_tracker.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) 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_NAVIGATION_TRACKER_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 26 matching lines...) Expand all
37 LoadingState known_state, 37 LoadingState known_state,
38 const BrowserInfo* browser_info); 38 const BrowserInfo* browser_info);
39 39
40 virtual ~NavigationTracker(); 40 virtual ~NavigationTracker();
41 41
42 // Gets whether a navigation is pending for the specified frame. |frame_id| 42 // Gets whether a navigation is pending for the specified frame. |frame_id|
43 // may be empty to signify the main frame. 43 // may be empty to signify the main frame.
44 Status IsPendingNavigation(const std::string& frame_id, bool* is_pending); 44 Status IsPendingNavigation(const std::string& frame_id, bool* is_pending);
45 45
46 // Overridden from DevToolsEventListener: 46 // Overridden from DevToolsEventListener:
47 virtual Status OnConnected(DevToolsClient* client) OVERRIDE; 47 virtual Status OnConnected(DevToolsClient* client) override;
48 virtual Status OnEvent(DevToolsClient* client, 48 virtual Status OnEvent(DevToolsClient* client,
49 const std::string& method, 49 const std::string& method,
50 const base::DictionaryValue& params) OVERRIDE; 50 const base::DictionaryValue& params) override;
51 virtual Status OnCommandSuccess(DevToolsClient* client, 51 virtual Status OnCommandSuccess(DevToolsClient* client,
52 const std::string& method) OVERRIDE; 52 const std::string& method) override;
53 53
54 private: 54 private:
55 DevToolsClient* client_; 55 DevToolsClient* client_;
56 LoadingState loading_state_; 56 LoadingState loading_state_;
57 const BrowserInfo* browser_info_; 57 const BrowserInfo* browser_info_;
58 std::set<std::string> pending_frame_set_; 58 std::set<std::string> pending_frame_set_;
59 std::set<std::string> scheduled_frame_set_; 59 std::set<std::string> scheduled_frame_set_;
60 60
61 void ResetLoadingState(LoadingState loading_state); 61 void ResetLoadingState(LoadingState loading_state);
62 62
63 DISALLOW_COPY_AND_ASSIGN(NavigationTracker); 63 DISALLOW_COPY_AND_ASSIGN(NavigationTracker);
64 }; 64 };
65 65
66 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_ 66 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_NAVIGATION_TRACKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698