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

Side by Side Diff: athena/content/app_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_APP_ACTIVITY_H_ 5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_H_
6 #define ATHENA_CONTENT_APP_ACTIVITY_H_ 6 #define ATHENA_CONTENT_APP_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 28 matching lines...) Expand all
39 virtual aura::Window* GetWindow() OVERRIDE; 39 virtual aura::Window* GetWindow() OVERRIDE;
40 40
41 // ActivityViewModel: 41 // ActivityViewModel:
42 virtual void Init() OVERRIDE; 42 virtual void Init() OVERRIDE;
43 virtual SkColor GetRepresentativeColor() const OVERRIDE; 43 virtual SkColor GetRepresentativeColor() const OVERRIDE;
44 virtual base::string16 GetTitle() const OVERRIDE; 44 virtual base::string16 GetTitle() const OVERRIDE;
45 virtual bool UsesFrame() const OVERRIDE; 45 virtual bool UsesFrame() const OVERRIDE;
46 virtual views::View* GetContentsView() OVERRIDE; 46 virtual views::View* GetContentsView() OVERRIDE;
47 virtual void CreateOverviewModeImage() OVERRIDE; 47 virtual void CreateOverviewModeImage() OVERRIDE;
48 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 48 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
49 virtual void PrepareContentsForOverview() OVERRIDE;
50 virtual void ResetContentsView() OVERRIDE;
49 51
50 protected: 52 protected:
51 // content::WebContentsObserver: 53 // content::WebContentsObserver:
52 virtual void TitleWasSet(content::NavigationEntry* entry, 54 virtual void TitleWasSet(content::NavigationEntry* entry,
53 bool explicit_set) OVERRIDE; 55 bool explicit_set) OVERRIDE;
54 virtual void DidUpdateFaviconURL( 56 virtual void DidUpdateFaviconURL(
55 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 57 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
56 58
57 protected: 59 protected:
58 virtual content::WebContents* GetWebContents() = 0; 60 virtual content::WebContents* GetWebContents() = 0;
(...skipping 16 matching lines...) Expand all
75 // This object is owned by |AppRegistry| and will be a valid pointer as long 77 // This object is owned by |AppRegistry| and will be a valid pointer as long
76 // as this object lives. 78 // as this object lives.
77 AppActivityRegistry* app_activity_registry_; 79 AppActivityRegistry* app_activity_registry_;
78 80
79 DISALLOW_COPY_AND_ASSIGN(AppActivity); 81 DISALLOW_COPY_AND_ASSIGN(AppActivity);
80 }; 82 };
81 83
82 } // namespace athena 84 } // namespace athena
83 85
84 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ 86 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698