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

Side by Side Diff: chrome/test/chromedriver/chrome/javascript_dialog_manager.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_JAVASCRIPT_DIALOG_MANAGER_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 explicit JavaScriptDialogManager(DevToolsClient* client); 25 explicit JavaScriptDialogManager(DevToolsClient* client);
26 virtual ~JavaScriptDialogManager(); 26 virtual ~JavaScriptDialogManager();
27 27
28 bool IsDialogOpen(); 28 bool IsDialogOpen();
29 29
30 Status GetDialogMessage(std::string* message); 30 Status GetDialogMessage(std::string* message);
31 31
32 Status HandleDialog(bool accept, const std::string* text); 32 Status HandleDialog(bool accept, const std::string* text);
33 33
34 // Overridden from DevToolsEventListener: 34 // Overridden from DevToolsEventListener:
35 virtual Status OnConnected(DevToolsClient* client) OVERRIDE; 35 virtual Status OnConnected(DevToolsClient* client) override;
36 virtual Status OnEvent(DevToolsClient* client, 36 virtual Status OnEvent(DevToolsClient* client,
37 const std::string& method, 37 const std::string& method,
38 const base::DictionaryValue& params) OVERRIDE; 38 const base::DictionaryValue& params) override;
39 39
40 private: 40 private:
41 DevToolsClient* client_; 41 DevToolsClient* client_;
42 42
43 // The queue of unhandled dialogs. This may be greater than 1 in rare 43 // The queue of unhandled dialogs. This may be greater than 1 in rare
44 // cases. E.g., if the page shows an alert but before the manager received 44 // cases. E.g., if the page shows an alert but before the manager received
45 // the event, a script was injected via Inspector that triggered an alert. 45 // the event, a script was injected via Inspector that triggered an alert.
46 std::list<std::string> unhandled_dialog_queue_; 46 std::list<std::string> unhandled_dialog_queue_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManager); 48 DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManager);
49 }; 49 };
50 50
51 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_ 51 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_JAVASCRIPT_DIALOG_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698