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

Side by Side Diff: athena/content/content_activity_factory.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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 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_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 5 #ifndef ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
6 #define ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 6 #define ATHENA_CONTENT_CONTENT_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 12
13 class ContentActivityFactory : public ActivityFactory { 13 class ContentActivityFactory : public ActivityFactory {
14 public: 14 public:
15 ContentActivityFactory(); 15 ContentActivityFactory();
16 virtual ~ContentActivityFactory(); 16 ~ContentActivityFactory() override;
17 17
18 // Overridden from ActivityFactory: 18 // Overridden from ActivityFactory:
19 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, 19 Activity* CreateWebActivity(content::BrowserContext* browser_context,
20 const base::string16& title, 20 const base::string16& title,
21 const GURL& url) override; 21 const GURL& url) override;
22 virtual Activity* CreateWebActivity(content::WebContents* contents) override; 22 Activity* CreateWebActivity(content::WebContents* contents) override;
23 virtual Activity* CreateAppActivity(const std::string& app_id, 23 Activity* CreateAppActivity(const std::string& app_id,
24 views::WebView* web_view) override; 24 views::WebView* web_view) override;
25 25
26 private: 26 private:
27 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory); 27 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
28 }; 28 };
29 29
30 } // namespace athena 30 } // namespace athena
31 31
32 #endif // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 32 #endif // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698