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

Side by Side Diff: extensions/test/result_catcher.h

Issue 622343002: replace OVERRIDE and FINAL with override and final in extensions/ (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
« no previous file with comments | « extensions/test/extensions_unittests_main.cc ('k') | extensions/test/test_extensions_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_TEST_RESULT_CATCHER_H_ 5 #ifndef EXTENSIONS_TEST_RESULT_CATCHER_H_
6 #define EXTENSIONS_TEST_RESULT_CATCHER_H_ 6 #define EXTENSIONS_TEST_RESULT_CATCHER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 24 matching lines...) Expand all
35 void RestrictToBrowserContext(content::BrowserContext* context) { 35 void RestrictToBrowserContext(content::BrowserContext* context) {
36 browser_context_restriction_ = context; 36 browser_context_restriction_ = context;
37 } 37 }
38 38
39 const std::string& message() { return message_; } 39 const std::string& message() { return message_; }
40 40
41 private: 41 private:
42 // content::NotificationObserver: 42 // content::NotificationObserver:
43 virtual void Observe(int type, 43 virtual void Observe(int type,
44 const content::NotificationSource& source, 44 const content::NotificationSource& source,
45 const content::NotificationDetails& details) OVERRIDE; 45 const content::NotificationDetails& details) override;
46 46
47 content::NotificationRegistrar registrar_; 47 content::NotificationRegistrar registrar_;
48 48
49 // A sequential list of pass/fail notifications from the test extension(s). 49 // A sequential list of pass/fail notifications from the test extension(s).
50 std::deque<bool> results_; 50 std::deque<bool> results_;
51 51
52 // If it failed, what was the error message? 52 // If it failed, what was the error message?
53 std::deque<std::string> messages_; 53 std::deque<std::string> messages_;
54 std::string message_; 54 std::string message_;
55 55
56 // If non-NULL, we will listen to events from this BrowserContext only. 56 // If non-NULL, we will listen to events from this BrowserContext only.
57 content::BrowserContext* browser_context_restriction_; 57 content::BrowserContext* browser_context_restriction_;
58 58
59 // True if we're in a nested message loop waiting for results from 59 // True if we're in a nested message loop waiting for results from
60 // the extension. 60 // the extension.
61 bool waiting_; 61 bool waiting_;
62 }; 62 };
63 63
64 } // namespace extensions 64 } // namespace extensions
65 65
66 #endif // EXTENSIONS_TEST_RESULT_CATCHER_H_ 66 #endif // EXTENSIONS_TEST_RESULT_CATCHER_H_
OLDNEW
« no previous file with comments | « extensions/test/extensions_unittests_main.cc ('k') | extensions/test/test_extensions_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698