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

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

Issue 603033002: Get FileSelect dialog work on athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reformat Created 6 years, 2 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/activity/public/activity_manager.h ('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_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 "athena/content/app_activity_proxy.h" 10 #include "athena/content/app_activity_proxy.h"
(...skipping 25 matching lines...) Expand all
36 // Gets the content proxy so that the AppProxy can take it over. 36 // Gets the content proxy so that the AppProxy can take it over.
37 scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window); 37 scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window);
38 38
39 // Activity: 39 // Activity:
40 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; 40 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;
41 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE; 41 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;
42 virtual ActivityState GetCurrentState() OVERRIDE; 42 virtual ActivityState GetCurrentState() OVERRIDE;
43 virtual bool IsVisible() OVERRIDE; 43 virtual bool IsVisible() OVERRIDE;
44 virtual ActivityMediaState GetMediaState() OVERRIDE; 44 virtual ActivityMediaState GetMediaState() OVERRIDE;
45 virtual aura::Window* GetWindow() OVERRIDE; 45 virtual aura::Window* GetWindow() OVERRIDE;
46 virtual content::WebContents* GetWebContents() OVERRIDE;
46 47
47 // ActivityViewModel: 48 // ActivityViewModel:
48 virtual void Init() OVERRIDE; 49 virtual void Init() OVERRIDE;
49 virtual SkColor GetRepresentativeColor() const OVERRIDE; 50 virtual SkColor GetRepresentativeColor() const OVERRIDE;
50 virtual base::string16 GetTitle() const OVERRIDE; 51 virtual base::string16 GetTitle() const OVERRIDE;
51 virtual gfx::ImageSkia GetIcon() const OVERRIDE; 52 virtual gfx::ImageSkia GetIcon() const OVERRIDE;
52 virtual bool UsesFrame() const OVERRIDE; 53 virtual bool UsesFrame() const OVERRIDE;
53 virtual views::Widget* CreateWidget() OVERRIDE; 54 virtual views::Widget* CreateWidget() OVERRIDE;
54 virtual views::View* GetContentsView() OVERRIDE; 55 virtual views::View* GetContentsView() OVERRIDE;
55 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; 56 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 93
93 // The content proxy. 94 // The content proxy.
94 scoped_ptr<ContentProxy> content_proxy_; 95 scoped_ptr<ContentProxy> content_proxy_;
95 96
96 DISALLOW_COPY_AND_ASSIGN(AppActivity); 97 DISALLOW_COPY_AND_ASSIGN(AppActivity);
97 }; 98 };
98 99
99 } // namespace athena 100 } // namespace athena
100 101
101 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_ 102 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/activity/public/activity_manager.h ('k') | athena/content/app_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698