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

Side by Side Diff: athena/test/base/sample_activity_factory.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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/sample_activity.h ('k') | athena/test/base/test_app_model_builder.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 ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_ 5 #ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_
6 #define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_ 6 #define ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_
7 7
8 #include "athena/activity/public/activity_factory.h" 8 #include "athena/activity/public/activity_factory.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace athena { 11 namespace athena {
12 namespace test { 12 namespace test {
13 13
14 class SampleActivityFactory : public ActivityFactory { 14 class SampleActivityFactory : public ActivityFactory {
15 public: 15 public:
16 SampleActivityFactory(); 16 SampleActivityFactory();
17 virtual ~SampleActivityFactory(); 17 ~SampleActivityFactory() override;
18 18
19 // Overridden from ActivityFactory: 19 // Overridden from ActivityFactory:
20 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, 20 Activity* CreateWebActivity(content::BrowserContext* browser_context,
21 const base::string16& title, 21 const base::string16& title,
22 const GURL& url) override; 22 const GURL& url) override;
23 virtual Activity* CreateWebActivity(content::WebContents* contents) override; 23 Activity* CreateWebActivity(content::WebContents* contents) override;
24 virtual Activity* CreateAppActivity(const std::string& app_id, 24 Activity* CreateAppActivity(const std::string& app_id,
25 views::WebView* web_view) override; 25 views::WebView* web_view) override;
26 26
27 private: 27 private:
28 DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory); 28 DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory);
29 }; 29 };
30 30
31 } // namespace test 31 } // namespace test
32 } // namespace athena 32 } // namespace athena
33 33
34 #endif // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_ 34 #endif // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_FACTORY_H_
OLDNEW
« no previous file with comments | « athena/test/base/sample_activity.h ('k') | athena/test/base/test_app_model_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698