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

Side by Side Diff: athena/test/chrome/athena_app_browsertest.h

Issue 633463003: Replacing the OVERRIDE with override in /src/athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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 | « athena/test/base/activity_lifetime_tracker.h ('k') | no next file » | 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 ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_ 5 #ifndef ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_
6 #define ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_ 6 #define ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_
7 7
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 9
10 namespace athena { 10 namespace athena {
11 class Activity; 11 class Activity;
12 12
13 // Base class for athena tests. 13 // Base class for athena tests.
14 // 14 //
15 // Note: To avoid asynchronous resource manager events, the memory pressure 15 // Note: To avoid asynchronous resource manager events, the memory pressure
16 // callback gets turned off at the beginning to a low memory pressure. 16 // callback gets turned off at the beginning to a low memory pressure.
17 class AthenaAppBrowserTest : public extensions::PlatformAppBrowserTest { 17 class AthenaAppBrowserTest : public extensions::PlatformAppBrowserTest {
18 public: 18 public:
19 AthenaAppBrowserTest(); 19 AthenaAppBrowserTest();
20 virtual ~AthenaAppBrowserTest(); 20 virtual ~AthenaAppBrowserTest();
21 21
22 protected: 22 protected:
23 // Creates an app activity and returns after app is fully loaded. 23 // Creates an app activity and returns after app is fully loaded.
24 Activity* CreateTestAppActivity(const std::string app_id); 24 Activity* CreateTestAppActivity(const std::string app_id);
25 25
26 // Gets an application ID for an installed test application. 26 // Gets an application ID for an installed test application.
27 const std::string& GetTestAppID(); 27 const std::string& GetTestAppID();
28 28
29 // BrowserTestBase: 29 // BrowserTestBase:
30 virtual void SetUpOnMainThread() OVERRIDE; 30 virtual void SetUpOnMainThread() override;
31 31
32 private: 32 private:
33 // Our created app id - after it got created and installed. 33 // Our created app id - after it got created and installed.
34 std::string app_id_; 34 std::string app_id_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(AthenaAppBrowserTest); 36 DISALLOW_COPY_AND_ASSIGN(AthenaAppBrowserTest);
37 }; 37 };
38 38
39 } // namespace athena 39 } // namespace athena
40 40
41 #endif // ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_ 41 #endif // ATHENA_TEST_CHROME_ATHENA_APP_BROWSERTEST_H_
42 42
OLDNEW
« no previous file with comments | « athena/test/base/activity_lifetime_tracker.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698