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

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: 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
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 20 matching lines...) Expand all
31 virtual bool IsVisible() OVERRIDE; 31 virtual bool IsVisible() OVERRIDE;
32 virtual ActivityMediaState GetMediaState() OVERRIDE; 32 virtual ActivityMediaState GetMediaState() OVERRIDE;
33 virtual aura::Window* GetWindow() OVERRIDE; 33 virtual aura::Window* GetWindow() OVERRIDE;
34 34
35 // ActivityViewModel overrides: 35 // ActivityViewModel overrides:
36 virtual void Init() OVERRIDE; 36 virtual void Init() OVERRIDE;
37 virtual SkColor GetRepresentativeColor() const OVERRIDE; 37 virtual SkColor GetRepresentativeColor() const OVERRIDE;
38 virtual base::string16 GetTitle() const OVERRIDE; 38 virtual base::string16 GetTitle() const OVERRIDE;
39 virtual bool UsesFrame() const OVERRIDE; 39 virtual bool UsesFrame() const OVERRIDE;
40 virtual views::View* GetContentsView() OVERRIDE; 40 virtual views::View* GetContentsView() OVERRIDE;
41 virtual void PrepareContentsForOverview() OVERRIDE;
42 virtual void ResetContentsView() OVERRIDE;
41 virtual void CreateOverviewModeImage() OVERRIDE; 43 virtual void CreateOverviewModeImage() OVERRIDE;
42 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 44 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
43 45
44 private: 46 private:
45 // The creator of this object which needs to be informed if the object gets 47 // The creator of this object which needs to be informed if the object gets
46 // destroyed or the application should get restarted. 48 // destroyed or the application should get restarted.
47 AppActivityRegistry* app_activity_registry_; 49 AppActivityRegistry* app_activity_registry_;
48 50
49 // The presentation values. 51 // The presentation values.
50 const base::string16 title_; 52 const base::string16 title_;
51 const gfx::ImageSkia image_; 53 const gfx::ImageSkia image_;
52 const SkColor color_; 54 const SkColor color_;
53 55
54 // The associated view. 56 // The associated view.
55 views::View* view_; 57 views::View* view_;
56 58
57 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy); 59 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);
58 }; 60 };
59 61
60 } // namespace athena 62 } // namespace athena
61 63
62 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_ 64 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698