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

Side by Side Diff: athena/content/app_activity_proxy.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, 1 month 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/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.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_CONTENT_APP_ACTIVITY_PROXY_H_ 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "athena/activity/public/activity.h" 10 #include "athena/activity/public/activity.h"
(...skipping 12 matching lines...) Expand all
23 class AppActivityProxy : public Activity, 23 class AppActivityProxy : public Activity,
24 public ActivityViewModel { 24 public ActivityViewModel {
25 public: 25 public:
26 // The |replaced_activity| is the activity which this proxy replaces. Note 26 // The |replaced_activity| is the activity which this proxy replaces. Note
27 // that after the Init() call got called, this object will become invalid. 27 // that after the Init() call got called, this object will become invalid.
28 // The |creator| should be informed when the object goes away. 28 // The |creator| should be informed when the object goes away.
29 AppActivityProxy(AppActivity* replaced_activity, 29 AppActivityProxy(AppActivity* replaced_activity,
30 AppActivityRegistry* creator); 30 AppActivityRegistry* creator);
31 31
32 protected: 32 protected:
33 virtual ~AppActivityProxy(); 33 ~AppActivityProxy() override;
34 34
35 // Activity overrides: 35 // Activity overrides:
36 virtual ActivityViewModel* GetActivityViewModel() override; 36 ActivityViewModel* GetActivityViewModel() override;
37 virtual void SetCurrentState(ActivityState state) override; 37 void SetCurrentState(ActivityState state) override;
38 virtual ActivityState GetCurrentState() override; 38 ActivityState GetCurrentState() override;
39 virtual bool IsVisible() override; 39 bool IsVisible() override;
40 virtual ActivityMediaState GetMediaState() override; 40 ActivityMediaState GetMediaState() override;
41 virtual aura::Window* GetWindow() override; 41 aura::Window* GetWindow() override;
42 virtual content::WebContents* GetWebContents() override; 42 content::WebContents* GetWebContents() override;
43 43
44 // ActivityViewModel overrides: 44 // ActivityViewModel overrides:
45 virtual void Init() override; 45 void Init() override;
46 virtual SkColor GetRepresentativeColor() const override; 46 SkColor GetRepresentativeColor() const override;
47 virtual base::string16 GetTitle() const override; 47 base::string16 GetTitle() const override;
48 virtual gfx::ImageSkia GetIcon() const override; 48 gfx::ImageSkia GetIcon() const override;
49 virtual bool UsesFrame() const override; 49 bool UsesFrame() const override;
50 virtual views::View* GetContentsView() override; 50 views::View* GetContentsView() override;
51 virtual views::Widget* CreateWidget() override; 51 views::Widget* CreateWidget() override;
52 virtual gfx::ImageSkia GetOverviewModeImage() override; 52 gfx::ImageSkia GetOverviewModeImage() override;
53 virtual void PrepareContentsForOverview() override; 53 void PrepareContentsForOverview() override;
54 virtual void ResetContentsView() override; 54 void ResetContentsView() override;
55 55
56 private: 56 private:
57 // The creator of this object which needs to be informed if the object gets 57 // The creator of this object which needs to be informed if the object gets
58 // destroyed or the application should get restarted. 58 // destroyed or the application should get restarted.
59 AppActivityRegistry* app_activity_registry_; 59 AppActivityRegistry* app_activity_registry_;
60 60
61 // The presentation values. 61 // The presentation values.
62 const base::string16 title_; 62 const base::string16 title_;
63 const SkColor color_; 63 const SkColor color_;
64 64
(...skipping 10 matching lines...) Expand all
75 75
76 // True if restart got already called. 76 // True if restart got already called.
77 bool restart_called_; 77 bool restart_called_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); 79 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);
80 }; 80 };
81 81
82 } // namespace athena 82 } // namespace athena
83 83
84 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 84 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
OLDNEW
« no previous file with comments | « athena/content/app_activity_browsertest.cc ('k') | athena/content/app_activity_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698