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

Side by Side Diff: athena/content/web_activity.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_PUBLIC_WEB_ACTIVITY_H_ 5 #ifndef ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
6 #define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_ 6 #define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_
7 7
8 #include "athena/activity/public/activity.h" 8 #include "athena/activity/public/activity.h"
9 #include "athena/activity/public/activity_view_model.h" 9 #include "athena/activity/public/activity_view_model.h"
10 #include "content/public/browser/web_contents_observer.h" 10 #include "content/public/browser/web_contents_observer.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 virtual aura::Window* GetWindow() OVERRIDE; 42 virtual aura::Window* GetWindow() OVERRIDE;
43 43
44 // ActivityViewModel: 44 // ActivityViewModel:
45 virtual void Init() OVERRIDE; 45 virtual void Init() OVERRIDE;
46 virtual SkColor GetRepresentativeColor() const OVERRIDE; 46 virtual SkColor GetRepresentativeColor() const OVERRIDE;
47 virtual base::string16 GetTitle() const OVERRIDE; 47 virtual base::string16 GetTitle() const OVERRIDE;
48 virtual bool UsesFrame() const OVERRIDE; 48 virtual bool UsesFrame() const OVERRIDE;
49 virtual views::View* GetContentsView() OVERRIDE; 49 virtual views::View* GetContentsView() OVERRIDE;
50 virtual void CreateOverviewModeImage() OVERRIDE; 50 virtual void CreateOverviewModeImage() OVERRIDE;
51 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 51 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
52 virtual void PrepareContentsForOverview() OVERRIDE;
53 virtual void ResetContentsView() OVERRIDE;
52 54
53 // content::WebContentsObserver: 55 // content::WebContentsObserver:
54 virtual void TitleWasSet(content::NavigationEntry* entry, 56 virtual void TitleWasSet(content::NavigationEntry* entry,
55 bool explicit_set) OVERRIDE; 57 bool explicit_set) OVERRIDE;
56 virtual void DidUpdateFaviconURL( 58 virtual void DidUpdateFaviconURL(
57 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 59 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
58 virtual void DidChangeThemeColor(SkColor theme_color) OVERRIDE; 60 virtual void DidChangeThemeColor(SkColor theme_color) OVERRIDE;
59 61
60 private: 62 private:
61 content::BrowserContext* browser_context_; 63 content::BrowserContext* browser_context_;
62 const GURL url_; 64 const GURL url_;
63 AthenaWebView* web_view_; 65 AthenaWebView* web_view_;
64 SkColor title_color_; 66 SkColor title_color_;
65 67
66 // The current state for this activity. 68 // The current state for this activity.
67 ActivityState current_state_; 69 ActivityState current_state_;
68 70
69 // The image which will be used in overview mode. 71 // The image which will be used in overview mode.
70 gfx::ImageSkia overview_mode_image_; 72 gfx::ImageSkia overview_mode_image_;
71 73
72 DISALLOW_COPY_AND_ASSIGN(WebActivity); 74 DISALLOW_COPY_AND_ASSIGN(WebActivity);
73 }; 75 };
74 76
75 } // namespace athena 77 } // namespace athena
76 78
77 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ 79 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698