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

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: 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_proxy.cc ('k') | athena/content/web_activity.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_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 "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual aura::Window* GetWindow() OVERRIDE; 46 virtual aura::Window* GetWindow() OVERRIDE;
47 47
48 // ActivityViewModel: 48 // ActivityViewModel:
49 virtual void Init() OVERRIDE; 49 virtual void Init() OVERRIDE;
50 virtual SkColor GetRepresentativeColor() const OVERRIDE; 50 virtual SkColor GetRepresentativeColor() const OVERRIDE;
51 virtual base::string16 GetTitle() const OVERRIDE; 51 virtual base::string16 GetTitle() const OVERRIDE;
52 virtual bool UsesFrame() const OVERRIDE; 52 virtual bool UsesFrame() const OVERRIDE;
53 virtual views::View* GetContentsView() OVERRIDE; 53 virtual views::View* GetContentsView() OVERRIDE;
54 virtual void CreateOverviewModeImage() OVERRIDE; 54 virtual void CreateOverviewModeImage() OVERRIDE;
55 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 55 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
56 virtual void PrepareContentsForOverview() OVERRIDE;
57 virtual void ResetContentsView() OVERRIDE;
56 58
57 // content::WebContentsObserver: 59 // content::WebContentsObserver:
58 virtual void TitleWasSet(content::NavigationEntry* entry, 60 virtual void TitleWasSet(content::NavigationEntry* entry,
59 bool explicit_set) OVERRIDE; 61 bool explicit_set) OVERRIDE;
60 virtual void DidUpdateFaviconURL( 62 virtual void DidUpdateFaviconURL(
61 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 63 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
62 virtual void DidChangeThemeColor(SkColor theme_color) OVERRIDE; 64 virtual void DidChangeThemeColor(SkColor theme_color) OVERRIDE;
63 65
64 private: 66 private:
65 // Make the content visible. This call should only be paired with 67 // Make the content visible. This call should only be paired with
(...skipping 18 matching lines...) Expand all
84 86
85 // The image which will be used in overview mode. 87 // The image which will be used in overview mode.
86 gfx::ImageSkia overview_mode_image_; 88 gfx::ImageSkia overview_mode_image_;
87 89
88 DISALLOW_COPY_AND_ASSIGN(WebActivity); 90 DISALLOW_COPY_AND_ASSIGN(WebActivity);
89 }; 91 };
90 92
91 } // namespace athena 93 } // namespace athena
92 94
93 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ 95 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/content/app_activity_proxy.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698