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

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

Issue 518673007: Make activities have a thick border when in overview mode part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_overview2
Patch Set: Rebased Created 6 years, 3 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/content/app_activity.cc ('k') | athena/content/app_activity_proxy.cc » ('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 27 matching lines...) Expand all
38 virtual aura::Window* GetWindow() OVERRIDE; 38 virtual aura::Window* GetWindow() OVERRIDE;
39 39
40 // ActivityViewModel overrides: 40 // ActivityViewModel overrides:
41 virtual void Init() OVERRIDE; 41 virtual void Init() OVERRIDE;
42 virtual SkColor GetRepresentativeColor() const OVERRIDE; 42 virtual SkColor GetRepresentativeColor() const OVERRIDE;
43 virtual base::string16 GetTitle() const OVERRIDE; 43 virtual base::string16 GetTitle() const OVERRIDE;
44 virtual bool UsesFrame() const OVERRIDE; 44 virtual bool UsesFrame() const OVERRIDE;
45 virtual views::View* GetContentsView() OVERRIDE; 45 virtual views::View* GetContentsView() OVERRIDE;
46 virtual void CreateOverviewModeImage() OVERRIDE; 46 virtual void CreateOverviewModeImage() OVERRIDE;
47 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 47 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
48 virtual void PrepareContentsForOverview() OVERRIDE;
49 virtual void ResetContentsView() OVERRIDE;
48 50
49 private: 51 private:
50 // The creator of this object which needs to be informed if the object gets 52 // The creator of this object which needs to be informed if the object gets
51 // destroyed or the application should get restarted. 53 // destroyed or the application should get restarted.
52 AppActivityRegistry* app_activity_registry_; 54 AppActivityRegistry* app_activity_registry_;
53 55
54 // The presentation values. 56 // The presentation values.
55 const base::string16 title_; 57 const base::string16 title_;
56 const gfx::ImageSkia image_; 58 const gfx::ImageSkia image_;
57 const SkColor color_; 59 const SkColor color_;
58 60
59 // The activity which gets replaced. It is used to sort the activity against 61 // The activity which gets replaced. It is used to sort the activity against
60 // upon initialization. Once moved, this value gets reset since the object 62 // upon initialization. Once moved, this value gets reset since the object
61 // can go away at any time. 63 // can go away at any time.
62 Activity* replaced_activity_; 64 Activity* replaced_activity_;
63 65
64 // The associated view. 66 // The associated view.
65 views::View* view_; 67 views::View* view_;
66 68
67 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); 69 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);
68 }; 70 };
69 71
70 } // namespace athena 72 } // namespace athena
71 73
72 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 74 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
OLDNEW
« no previous file with comments | « athena/content/app_activity.cc ('k') | athena/content/app_activity_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698