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

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

Issue 375143002: Use Widget frame and WidgetDelegate in ActvityWidget (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « athena/athena.gyp ('k') | athena/content/app_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_APP_ACTIVITY_H_ 5 #ifndef ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_
6 #define ATHENA_CONTENT_PUBLIC_APP_ACTIVITY_H_ 6 #define ATHENA_CONTENT_PUBLIC_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 14 matching lines...) Expand all
25 public: 25 public:
26 explicit AppActivity(apps::ShellAppWindow* app_window); 26 explicit AppActivity(apps::ShellAppWindow* app_window);
27 virtual ~AppActivity(); 27 virtual ~AppActivity();
28 28
29 protected: 29 protected:
30 // Activity: 30 // Activity:
31 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; 31 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
32 32
33 // ActivityViewModel: 33 // ActivityViewModel:
34 virtual void Init() OVERRIDE; 34 virtual void Init() OVERRIDE;
35 virtual SkColor GetRepresentativeColor() OVERRIDE; 35 virtual SkColor GetRepresentativeColor() const OVERRIDE;
36 virtual base::string16 GetTitle() OVERRIDE; 36 virtual base::string16 GetTitle() const OVERRIDE;
37 virtual bool UsesFrame() const OVERRIDE;
37 virtual views::View* GetContentsView() OVERRIDE; 38 virtual views::View* GetContentsView() OVERRIDE;
38 39
39 // content::WebContentsObserver: 40 // content::WebContentsObserver:
40 virtual void TitleWasSet(content::NavigationEntry* entry, 41 virtual void TitleWasSet(content::NavigationEntry* entry,
41 bool explicit_set) OVERRIDE; 42 bool explicit_set) OVERRIDE;
42 virtual void DidUpdateFaviconURL( 43 virtual void DidUpdateFaviconURL(
43 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 44 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
44 45
45 private: 46 private:
46 scoped_ptr<apps::ShellAppWindow> app_window_; 47 scoped_ptr<apps::ShellAppWindow> app_window_;
47 views::WebView* web_view_; 48 views::WebView* web_view_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(AppActivity); 50 DISALLOW_COPY_AND_ASSIGN(AppActivity);
50 }; 51 };
51 52
52 } // namespace athena 53 } // namespace athena
53 54
54 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ 55 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/athena.gyp ('k') | athena/content/app_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698